X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Fusing-topic-branches.txt;h=c6c635a51ee813a9c09b342e2c06a2644b0ac413;hb=e66ab03fcfb508efbe2b73bafc7cf0ef16430378;hp=6fc69e12ebf9b69eca369bee066858a3bf309f65;hpb=23e8673093ff78c32d2e6aa271987d489e2f4c76;p=git.git diff --git a/Documentation/howto/using-topic-branches.txt b/Documentation/howto/using-topic-branches.txt index 6fc69e12..c6c635a5 100644 --- a/Documentation/howto/using-topic-branches.txt +++ b/Documentation/howto/using-topic-branches.txt @@ -1,6 +1,8 @@ Date: Mon, 15 Aug 2005 12:17:41 -0700 From: tony.luck@intel.com Subject: Some tutorial text (was git/cogito workshop/bof at linuxconf au?) +Abstract: In this article, Tony Luck discusses how he uses GIT + as a Linux subsystem maintainer. Here's something that I've been putting together on how I'm using GIT as a Linux subsystem maintainer. @@ -164,7 +166,7 @@ output from: is empty. At this point the branch can be deleted: - $ rm .git/refs/heads/branchname + $ git branch -d branchname Some changes are so trivial that it is not necessary to create a separate branch and then merge into each of the test and release branches. For @@ -243,7 +245,7 @@ gb=$(tput setab 2) rb=$(tput setab 1) restore=$(tput setab 9) -if [ `git-rev-tree release ^test | wc -c` -gt 0 ] +if [ `git-rev-list release ^test | wc -c` -gt 0 ] then echo $rb Warning: commits in release that are not in test $restore git-whatchanged release ^test @@ -260,7 +262,7 @@ do status= for ref in test release linus do - if [ `git-rev-tree $branch ^$ref | wc -c` -gt 0 ] + if [ `git-rev-list $branch ^$ref | wc -c` -gt 0 ] then status=$status${ref:0:1} fi