[PATCH 2/8] HACKING: we use "merge --log" even when merging master

[Stefano Lattarini]

Signed-off-by: Stefano Lattarini <address@hidden>
---
 HACKING | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/HACKING b/HACKING
index bfb4cc8..edafe94 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
-- 
1.8.1.rc3.192.g2d0029e