diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:16 -0700 |
| commit | 520d7e278cfd25057e883575060b7378dfab61dc (patch) | |
| tree | 3f20d1056ba4a3e1de652e25d32f2736395a8e2b /Documentation | |
| parent | afb5f39e24eadc5933b34cfd17c1089e482d6a6b (diff) | |
| parent | 41728d69426dd707d4978929f8f4ac7a16f115f3 (diff) | |
| download | git-520d7e278cfd25057e883575060b7378dfab61dc.tar.gz git-520d7e278cfd25057e883575060b7378dfab61dc.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/git-reset.txt: suggest git commit --amend in example.
Build RPM with ETC_GITCONFIG=/etc/gitconfig
Ignore all man sections as they are generated files.
Fix typo in git-am: s/Was is/Was it/
Reverse the order of -b and --track in the man page.
dir.c(common_prefix): Fix two bugs
Conflicts:
git.spec.in
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/.gitignore | 3 | ||||
| -rw-r--r-- | Documentation/git-checkout.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 2 |
3 files changed, 4 insertions, 3 deletions
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 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] <new_branch> [-l]] [-m] [<branch>] +'git-checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] 'git-checkout' [<tree-ish>] <paths>... DESCRIPTION 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:: + |