development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

update using-topic-branches

Browse source 
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>
This commit is contained in:
Luck, Tony 2006-01-20 11:00:18 -08:00 committed by Junio C Hamano
parent e7555785f4
commit abb9ae95f4
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/howto/using-topic-branches.txt
View file

@ -9,7 +9,7 @@ GIT as a Linux subsystem maintainer.
-Tony
Last updated w.r.t. GIT 0.99.9f
Last updated w.r.t. GIT 1.1
Linux subsystem maintenance using GIT
-------------------------------------
@ -92,6 +92,14 @@ These can be easily kept up to date by merging from the "linus" branch:
$ git checkout test && git merge "Auto-update from upstream" test linus
$ git checkout release && git merge "Auto-update from upstream" release linus
Important note! If you have any local changes in these branches, then
this merge will create a commit object in the history (with no local
changes git will simply do a "Fast forward" merge). Many people dislike
the "noise" that this creates in the Linux history, so you should avoid
doing this capriciously in the "release" branch, as these noisy commits
will become part of the permanent history when you ask Linus to pull
from the release branch.
Set up so that you can push upstream to your public tree (you need to
log-in to the remote system and create an empty tree there before the
first push).