Tony Luck points out that I missed a few places when I tried to convert from using a "linus" branch to using the more standard "origin" remote setup. This is my quick fix. I haven't yet tested the scripts. (And the modifications aren't *completely* trivial, so it would probably be a good idea.) Signed-off-by: "J. Bruce Fields" <bfields@xxxxxxxxxxxxxx> --- Documentation/user-manual.txt | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) On Mon, May 14, 2007 at 09:30:47AM -0700, Luck, Tony wrote: > There are a few places where the text still references my "linus" > branch ... you fixed up the start of the document to switch this > over to the more standard "origin". Hm. I should actually test those scripts and maybe take a harder look at them to decide whether they could be simplified or replaced with any new git functionality. Anyway, thanks for the proofreading! (And for putting that together in the first place. People seem to find this sort of example really helpful.) --b. diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 5fb86f2..6324a09 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1895,9 +1895,9 @@ public trees using gitlink:git-remote[1] to set up a "remote" and git-fetch[1] to keep them up-to-date; see <<repositories-and-branches>>. Now create the branches in which you are going to work; these start out -at the current tip of the linus branch, and should be set up (using the ---track option to gitlink:git-branch[1]) to merge changes in from linus -by default. +at the current tip of origin/master branch, and should be set up (using +the --track option to gitlink:git-branch[1]) to merge changes in from +Linus by default. ------------------------------------------------- $ git branch --track test origin/master @@ -1953,8 +1953,8 @@ $ git push mytree release Now to apply some patches from the community. Think of a short snappy name for a branch to hold this patch (or related group of -patches), and create a new branch from the current tip of the -linus branch: +patches), and create a new branch from the current tip of Linus's +branch: ------------------------------------------------- $ git checkout -b speed-up-spinlocks origin @@ -2012,13 +2012,13 @@ $ git log release..branchname (If this branch has not yet been merged you will see some log entries. If it has been merged, then there will be no output.) -Once a patch completes the great cycle (moving from test to release, then -pulled by Linus, and finally coming back into your local "linus" branch) -the branch for this change is no longer needed. You detect this when the -output from: +Once a patch completes the great cycle (moving from test to release, +then pulled by Linus, and finally coming back into your local +"origin/master" branch) the branch for this change is no longer needed. +You detect this when the output from: ------------------------------------------------- -$ git log linus..branchname +$ git log origin..branchname ------------------------------------------------- is empty. At this point the branch can be deleted: @@ -2050,16 +2050,16 @@ Here are some of the scripts that simplify all this even further. ------------------------------------------------- ==== update script ==== # Update a branch in my GIT tree. If the branch to be updated -# is "linus", then pull from kernel.org. Otherwise merge local -# linus branch into test|release branch +# is origin, then pull from kernel.org. Otherwise merge +# origin/master branch into test|release branch case "$1" in test|release) git checkout $1 && git pull . origin ;; -linus) +origin) before=$(cat .git/refs/heads/origin/master) - git fetch linus + git fetch origin after=$(cat .git/refs/heads/origin/master) if [ $before != $after ] then @@ -2067,7 +2067,7 @@ linus) fi ;; *) - echo "Usage: $0 linus|test|release" 1>&2 + echo "Usage: $0 origin|test|release" 1>&2 exit 1 ;; esac @@ -2122,14 +2122,14 @@ fi for branch in `ls .git/refs/heads` do - if [ $branch = linus -o $branch = test -o $branch = release ] + if [ $branch = test -o $branch = release ] then continue fi echo -n $gb ======= $branch ====== $restore " " status= - for ref in test release linus + for ref in test release origin/master do if [ `git rev-list $ref..$branch | wc -c` -gt 0 ] then -- 1.5.1.4.19.g69e2 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
