Re: Update HACKING

2024-04-23 Thread Paul Eggert
On 2024-04-23 12:41, Bruno Haible wrote: ?? That's not a difference between how I and how you work. Oh, right, I got my directions confused. Sorry about the noise.

Re: Update HACKING

2024-04-23 Thread Collin Funk
On 4/23/24 10:03 AM, Paul Eggert wrote: > I use 'git format-patch' and then read the patch; this works > reasonably well for me. gitk is nice, but can be a hassle if I'm in > Emacs or logged in remotely. I do the same, but also regenerate the patch before submitting because I am paranoid of accide

Re: Update HACKING

2024-04-23 Thread Bruno Haible
Paul Eggert wrote: > > +* Before pushing a commit, it is highly recommended that you review it in > > + its entirety. The easiest way to do so is to run > > +$ gitk > > I use 'git format-patch' and then read the patch; this works reasonably > well for me. gitk is nice, but can be a hassle if

Re: Update HACKING

2024-04-23 Thread Paul Eggert
On 2024-04-23 08:03, Bruno Haible wrote: +* We use a linear git history — no merges. To work in this setting, it's + recommended that you configure git with 'git config pull.rebase = true'. I don't follow this recommendation: instead, I make sure that my master branch matches upstream exactly