From e1de1f67f401939a4ae76c14449db7f12c97e494 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 20 Jan 2006 23:50:39 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.1.4-gabb9a --- howto-index.html | 2 +- howto/using-topic-branches.txt | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/howto-index.html b/howto-index.html index b6a929cf..b7056b0d 100644 --- a/howto-index.html +++ b/howto-index.html @@ -352,7 +352,7 @@ as a Linux subsystem maintainer.

diff --git a/howto/using-topic-branches.txt b/howto/using-topic-branches.txt index b3d592fc..2c98194c 100644 --- a/howto/using-topic-branches.txt +++ b/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). -- 2.11.0