The "--amend" option is used to amend the tip of the current branch. This documentation text was copied straight from the commit that implemented it. Some minor format tweaks for asciidoc were taken from work by Francis Daly in commit b0d08a5.. It looks good now also in the html page. Signed-off-by: Marco Roeland <marco.roeland@xxxxxxxxx> --- Documentation/git-commit.txt | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) 293dccf6f8c47294a42376ad96d8c1130b06c9b9 diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index d04b342..ec8b562 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/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 ----------- @@ -70,6 +71,27 @@ OPTIONS `-m`, and from file with `-C` are usually used as the 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 -- 1.3.0.rc2.gca38 - : 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