From 81178fe48c1466f400741842f9e3da1528cfd124 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Mon, 23 Apr 2007 19:56:45 -0400 Subject: Reverse the order of -b and --track in the man page. Using "-b --track newbranch oldbranch" gives the error: git checkout: updating paths is incompatible with switching branches/forcing However, "--track -b ..." works just fine. Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 4f2e847dc..918d8ee72 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch SYNOPSIS -------- [verse] -'git-checkout' [-q] [-f] [-b [--track | --no-track] [-l]] [-m] [] +'git-checkout' [-q] [-f] [[--track | --no-track] -b [-l]] [-m] [] 'git-checkout' [] ... DESCRIPTION -- cgit v1.2.1 From ce748f59923b3a3d432d6e8a12366f71284b595f Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Mon, 23 Apr 2007 20:02:34 -0400 Subject: Ignore all man sections as they are generated files. Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- Documentation/.gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/.gitignore b/Documentation/.gitignore index b98d21e98..a37b2152b 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -1,7 +1,6 @@ *.xml *.html -*.1 -*.7 +*.[1-8] *.made howto-index.txt doc.dep -- cgit v1.2.1 From 41728d69426dd707d4978929f8f4ac7a16f115f3 Mon Sep 17 00:00:00 2001 From: Gerrit Pape Date: Mon, 23 Apr 2007 12:06:29 +0000 Subject: Documentation/git-reset.txt: suggest git commit --amend in example. In example 'Undo a commit and redo', refer to 'git commit --amend', as this is the easier alternative. Signed-off-by: Junio C Hamano --- Documentation/git-reset.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Documentation') diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 5b55cda51..19c5b9bbd 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -67,6 +67,8 @@ message, or both. Leaves working tree as it was before "reset". <3> "reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead. ++ +See also the --amend option to gitlink:git-commit[1]. Undo commits permanently:: + -- cgit v1.2.1