diff options
| author | Luck, Tony <tony.luck@intel.com> | 2006-01-20 11:00:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-20 13:34:12 -0800 |
| commit | abb9ae95f4e65911561b40ab9f38a27e5677ca7d (patch) | |
| tree | 72ad40c22757588954eb8c1b2073752d47f03d0f /Documentation | |
| parent | e7555785f4edcf4988c53305349e3f525216e2cb (diff) | |
| download | git-abb9ae95f4e65911561b40ab9f38a27e5677ca7d.tar.gz git-abb9ae95f4e65911561b40ab9f38a27e5677ca7d.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/howto/using-topic-branches.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/howto/using-topic-branches.txt b/Documentation/howto/using-topic-branches.txt index b3d592fc3..2c98194cb 100644 --- a/Documentation/howto/using-topic-branches.txt +++ b/Documentation/howto/using-topic-branches.txt @@ -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). |