{"thread":{"id":"3112","subject":"[PATCH] update using-topic-branches","startedAt":"2006-01-20T19:00:18Z","lastAt":"2006-01-20T19:00:18Z","messageCount":1,"participants":["Luck, Tony"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"14961","messageId":"200601201900.k0KJ0Ia2023842@agluck-lia64.sc.intel.com","threadId":"3112","inReplyTo":null,"subject":"[PATCH] update using-topic-branches","fromName":"Luck, Tony","fromEmail":"tony.luck@intel.com","sentAt":"2006-01-20T19:00:18Z","receivedAt":"2006-01-20T19:00:18Z","isPatch":true,"sender":{"key":"tony.luck@intel.com","avatar":"https://avatars.githubusercontent.com/u/5446021?v=4"},"body":"Update documentation to warn users not to create noise in then Linux\nhistory by creating pointless \"Auto-update from upstream\" merge\ncommits.\n\nSigned-off-by: Tony Luck <tony.luck@intel.com>\n\n---\n\ndiff --git a/Documentation/howto/using-topic-branches.txt b/Documentation/howto/using-topic-branches.txt\nindex b3d592f..2c98194 100644\n--- a/Documentation/howto/using-topic-branches.txt\n+++ b/Documentation/howto/using-topic-branches.txt\n@@ -9,7 +9,7 @@ GIT as a Linux subsystem maintainer.\n \n -Tony\n \n-Last updated w.r.t. GIT 0.99.9f\n+Last updated w.r.t. GIT 1.1\n \n Linux subsystem maintenance using GIT\n -------------------------------------\n@@ -92,6 +92,14 @@ These can be easily kept up to date by m\n  $ git checkout test && git merge \"Auto-update from upstream\" test linus\n  $ git checkout release && git merge \"Auto-update from upstream\" release linus\n \n+Important note!  If you have any local changes in these branches, then\n+this merge will create a commit object in the history (with no local\n+changes git will simply do a \"Fast forward\" merge).  Many people dislike\n+the \"noise\" that this creates in the Linux history, so you should avoid\n+doing this capriciously in the \"release\" branch, as these noisy commits\n+will become part of the permanent history when you ask Linus to pull\n+from the release branch.\n+\n Set up so that you can push upstream to your public tree (you need to\n log-in to the remote system and create an empty tree there before the\n first push).\n"}]}