From 7138cc5eefae4ab5264cacfef5937a9ab235c238 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 10 Jan 2013 23:04:06 +0100 Subject: [PATCH] HACKING: we use "merge --log" even when merging master Signed-off-by: Stefano Lattarini --- 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 -- 2.7.4