diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-05 06:20:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-05 06:20:48 +0000 |
| commit | 2e6ded8990e867c457680899597363f3c1dd07f6 (patch) | |
| tree | a8b3625c96ffe486511441a9944dfcfe3231bf40 /git-commit.txt | |
| parent | d3dc64968e5141a389eeb491876e2aab1da90c24 (diff) | |
| download | git-htmldocs-2e6ded8990e867c457680899597363f3c1dd07f6.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-398-g0b0cd
Diffstat (limited to 'git-commit.txt')
| -rw-r--r-- | git-commit.txt | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/git-commit.txt b/git-commit.txt index ec7b577b8..b586c0f44 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -9,10 +9,10 @@ SYNOPSIS -------- [verse] 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run] - [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author] - [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] - [--date=<date>] [--cleanup=<mode>] [--status | --no-status] - [-i | -o] [--] [<file>...] + [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>] + [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] + [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] + [--status | --no-status] [-i | -o] [--] [<file>...] DESCRIPTION ----------- @@ -70,6 +70,19 @@ OPTIONS Like '-C', but with '-c' the editor is invoked, so that the user can further edit the commit message. +--fixup=<commit>:: + Construct a commit message for use with `rebase --autosquash`. + The commit message will be the subject line from the specified + commit with a prefix of "fixup! ". See linkgit:git-rebase[1] + for details. + +--squash=<commit>:: + Construct a commit message for use with `rebase --autosquash`. + The commit message subject line is taken from the specified + commit with a prefix of "squash! ". Can be used with additional + commit message options (`-m`/`-c`/`-C`/`-F`). See + linkgit:git-rebase[1] for details. + --reset-author:: When used with -C/-c/--amend options, declare that the authorship of the resulting commit now belongs of the committer. |