summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-09 15:56:17 -0800
committerJunio C Hamano <gitster@pobox.com>2011-03-09 15:56:17 -0800
commit66ecd2d05306fccc65e8d6a5f49100840ea7d3b6 (patch)
tree159eaf1f118e602f3a397ede9dc2b386a96b627a /Documentation/git-commit.txt
parent75618f1106b95defafca698d5cfdfd3dfb3a7e3c (diff)
parent37f7a8579363a98efc48dfb6964a519034fc9acc (diff)
downloadgit-66ecd2d05306fccc65e8d6a5f49100840ea7d3b6.tar.gz
Merge branch 'js/cherry-pick-usability'
* js/cherry-pick-usability: Teach commit about CHERRY_PICK_HEAD bash: teach __git_ps1 about CHERRY_PICK_HEAD Introduce CHERRY_PICK_HEAD t3507: introduce pristine-detach helper
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 8f89f6f08c..411fa68e9d 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/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