[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/8] HACKING: we use "merge --log" even when merging master
From: |
Stefano Lattarini |
Subject: |
[PATCH 2/8] HACKING: we use "merge --log" even when merging master |
Date: |
Thu, 10 Jan 2013 23:29:38 +0100 |
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
- [PATCH 0/8] Few minor improvements to HACKING, Stefano Lattarini, 2013/01/10
- [PATCH 2/8] HACKING: we use "merge --log" even when merging master,
Stefano Lattarini <=
- [PATCH 1/8] HACKING: typofix, Stefano Lattarini, 2013/01/10
- [PATCH 3/8] HACKING: "detailed explanation" in commit messages is almost mandatory, Stefano Lattarini, 2013/01/10
- [PATCH 4/8] HACKING: commit messages are not to follow GCS ChangeLog rules too strongly, Stefano Lattarini, 2013/01/10
- [PATCH 5/8] HACKING: fixlets about git branch rewinding policy, Stefano Lattarini, 2013/01/10
- [PATCH 6/8] HACKING: rewindable branches should live in the 'experimental/*' namespace, Stefano Lattarini, 2013/01/10
- [PATCH 7/8] HACKING: bug-tracker, the PLANS directory, and how to plan "big" changes, Stefano Lattarini, 2013/01/10
- [PATCH 8/8] HACKING: minor typofix, Stefano Lattarini, 2013/01/10