mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/cherry-pick-usability'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2011-03-09 15:56:17 -08:00
parent 75618f1106 37f7a85793
commit 66ecd2d053
12 changed files with 307 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-commit.txt
View File

@ -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