diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-10 01:18:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-10 01:18:12 +0000 |
| commit | a8cc1d89becb271f194a70827ae548d577d57c1e (patch) | |
| tree | 7eabc4dac68221fec320185b92fa2e47e6e31ab1 /git-commit.txt | |
| parent | c5be4cc1f482f43e73d5d1289ca5e4ab3cc0b9fd (diff) | |
| download | git-htmldocs-a8cc1d89becb271f194a70827ae548d577d57c1e.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-225-g83c3c
Diffstat (limited to 'git-commit.txt')
| -rw-r--r-- | git-commit.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-commit.txt b/git-commit.txt index 8f89f6f08..411fa68e9 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -84,9 +84,10 @@ OPTIONS 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. - This also renews the author timestamp. + When used with -C/-c/--amend options, or when committing after a + a conflicting cherry-pick, declare that the authorship of the + resulting commit now belongs of the committer. This also renews + the author timestamp. --short:: When doing a dry-run, give the output in the short-format. See |