diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-04-05 21:43:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-04-05 21:43:28 +0000 |
| commit | bfe9e75ebe8d3a83be46406130c76d54f8b14289 (patch) | |
| tree | eeb3aeedaa4b05c88608017b38b6ce531656e2e3 /git-commit.txt | |
| parent | 60d006311f52754d2c474c4b5a578c6c20b538e0 (diff) | |
| download | git-htmldocs-bfe9e75ebe8d3a83be46406130c76d54f8b14289.tar.gz | |
Autogenerated HTML docs for v1.3.0-rc2-gae5d
Diffstat (limited to 'git-commit.txt')
| -rw-r--r-- | git-commit.txt | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/git-commit.txt b/git-commit.txt index d04b342a9..2af472a56 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -9,7 +9,8 @@ SYNOPSIS -------- [verse] 'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] - [-e] [--author <author>] [--] [[-i | -o ]<file>...] + [--no-verify] [--amend] [-e] [--author <author>] + [--] [[-i | -o ]<file>...] DESCRIPTION ----------- @@ -71,6 +72,27 @@ OPTIONS commit log message unmodified. This option lets you further edit the message taken from these sources. +--amend:: + + Used to amend the tip of the current branch. Prepare the tree + object you would want to replace the latest commit as usual + (this includes the usual -i/-o and explicit paths), and the + commit log editor is seeded with the commit message from the + tip of the current branch. The commit you create replaces the + current tip -- if it was a merge, it will have the parents of + the current tip as parents -- so the current top commit is + discarded. ++ +It is a rough equivalent for: ++ +------------ + $ git reset --soft HEAD^ + $ ... do something else to come up with the right tree ... + $ git commit -c ORIG_HEAD +------------ ++ +but can be used to amend a merge commit. + -i|--include:: Instead of committing only the files specified on the command line, update them in the index file and then |