@matheusbsbs / matheus-bagliano / commits / abb9ae95f4
Fork 0

update using-topic-branches

Update documentation to warn users not to create noise in then Linux history by creating pointless "Auto-update from upstream" merge commits. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Luck, Tony committed Jan 20, 2006 at 11:00 UTC abb9ae95f4e65911561b40ab9f38a27e5677ca7d
1 file changed +9 -1
Documentation/howto/using-topic-branches.txt
+9 -1
@@ -9,7 +9,7 @@ GIT as a Linux subsystem maintainer.
9
10 -Tony
11
12 -Last updated w.r.t. GIT 0.99.9f
12 +Last updated w.r.t. GIT 1.1
13
14 Linux subsystem maintenance using GIT
15 -------------------------------------
@@ -92,6 +92,14 @@ These can be easily kept up to date by merging from the "linus" branch:
92 $ git checkout test && git merge "Auto-update from upstream" test linus
93 $ git checkout release && git merge "Auto-update from upstream" release linus
94
95 +Important note! If you have any local changes in these branches, then
96 +this merge will create a commit object in the history (with no local
97 +changes git will simply do a "Fast forward" merge). Many people dislike
98 +the "noise" that this creates in the Linux history, so you should avoid
99 +doing this capriciously in the "release" branch, as these noisy commits
100 +will become part of the permanent history when you ask Linus to pull
101 +from the release branch.
102 +
103 Set up so that you can push upstream to your public tree (you need to
104 log-in to the remote system and create an empty tree there before the
105 first push).