diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-10 23:04:06 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-10 23:04:06 +0100 |
commit | 7138cc5eefae4ab5264cacfef5937a9ab235c238 (patch) | |
tree | b4cb7f08bdf5b9fb3bf66b8639d7c20e8bee3eec /HACKING | |
parent | ad2e3170ac4d5fc407038ce07916b3d70f739b3a (diff) | |
download | automake-7138cc5eefae4ab5264cacfef5937a9ab235c238.tar.gz |
HACKING: we use "merge --log" even when merging master
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'HACKING')
-rw-r--r-- | HACKING | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -126,9 +126,9 @@ the active branches descending from the buggy commit. This offers a simple way to fix the bug consistently and effectively. -* For merges from branches other than maint, prefer 'git merge --log' over - plain 'git merge', so that a later 'git log' gives an indication of which - actual patches were merged even when they don't appear early in the list. +* When merging, prefer 'git merge --log' over plain 'git merge', so that + a later 'git log' gives an indication of which actual patches were + merged even when they don't appear early in the list. * master and release branches should not be rewound, i.e., should always fast-forward, except maybe for privacy issues. The maint branch should not |