On Tue, Sep 21, 2010 at 2:25 PM, Pat Notz <patnotz@xxxxxxxxx> wrote: > This option makes it convenient to construct commit messages for use > with 'rebase --autosquash'. The resulting commit message will be > "fixup! ..." where "..." is the subject line of the specified commit > message. > > Example usage: > $ git commit --fixup HEAD~2 > > Signed-off-by: Pat Notz <patnotz@xxxxxxxxx> > --- > Documentation/git-commit.txt | 13 +++++++++---- > builtin/commit.c | 23 +++++++++++++++++++---- > 2 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt > index 42fb1f5..3367f8f 100644 > --- a/Documentation/git-commit.txt > +++ b/Documentation/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) <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,11 @@ 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! ". > + I should add links to the git-rebase man page here. -- To unsubscribe from this list: 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