From: Stefano Lattarini Date: Thu, 10 Jan 2013 22:04:06 +0000 (+0100) Subject: HACKING: we use "merge --log" even when merging master X-Git-Tag: v1.13b~126 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7138cc5eefae4ab5264cacfef5937a9ab235c238;p=thirdparty%2Fautomake.git HACKING: we use "merge --log" even when merging master Signed-off-by: Stefano Lattarini --- diff --git a/HACKING b/HACKING index bfb4cc8dc..edafe94f1 100644 --- a/HACKING +++ b/HACKING @@ -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