Re: Update HACKING

[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. That way, my commit IDs are identical 
to upstream and I don't need to worry about differences between 
origin/master and master. On the rare occasions when I find someone else 
has collided with me in pushing to master, I revert my local changes, 
pull (without either rebasing or merging), and then reapply my changes 
before pushing.

Also, even if one prefers pull rebasing, 'git config 
branch.autoSetupRebase always' might be gentler than 'guit config 
pull.rebase true' which is more blunderbussy.


> +* 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 I'm in Emacs or logged 
in remotely.