summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-30 14:43:26 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-30 14:43:26 -0800
commitc142465c07b7857ebb4816fe95c3d212aa825bcc (patch)
tree0be9585e701bbdabc4a6f940807e26b3d862df48 /Documentation/git-commit.txt
parentd268cb940d6d299cbb7c77328c2f51843b0883df (diff)
parentc51f6ceed6a9a436f16f8b4f17eab1a3d17cffed (diff)
downloadgit-c142465c07b7857ebb4816fe95c3d212aa825bcc.tar.gz
Merge branch 'em/commit-claim'
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 3ea80c820f..d227cec9ba 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
- [(-c | -C) <commit>] [-F <file> | -m <msg>]
+ [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
[--allow-empty] [--no-verify] [-e] [--author=<author>]
[--cleanup=<mode>] [--] [[-i | -o ]<file>...]
@@ -69,6 +69,11 @@ OPTIONS
Like '-C', but with '-c' the editor is invoked, so that
the user can further edit the commit message.
+--reset-author::
+ When used with -C/-c/--amend options, declare that the
+ authorship of the resulting commit now belongs of the committer.
+ This also renews the author timestamp.
+
-F <file>::
--file=<file>::
Take the commit message from the given file. Use '-' to