diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:06:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:06:06 -0700 |
commit | ca1a5eeead00b1caa2274fe011bb3d7de0bdffb2 (patch) | |
tree | b7ef1c173838d4132244ca12624c3f5fb6dd1427 /Documentation | |
parent | Merge branch 'lt/dirmatch-optim' (diff) | |
parent | Allow cherry-pick (and revert) to add signoff line (diff) | |
download | tgif-ca1a5eeead00b1caa2274fe011bb3d7de0bdffb2.tar.xz |
Merge branch 'dm/cherry-pick-s'
* dm/cherry-pick-s:
Allow cherry-pick (and revert) to add signoff line
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-cherry-pick.txt | 5 | ||||
-rw-r--r-- | Documentation/git-revert.txt | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index f0beb412e6..ca048f46f6 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit SYNOPSIS -------- -'git-cherry-pick' [--edit] [-n] [-m parent-number] [-x] <commit> +'git-cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit> DESCRIPTION ----------- @@ -64,6 +64,9 @@ OPTIONS This is useful when cherry-picking more than one commits' effect to your working tree in a row. +-s|--signoff:: + Add Signed-off-by line at the end of the commit message. + Author ------ diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 93e20f7752..13ceabbcc8 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -7,7 +7,7 @@ git-revert - Revert an existing commit SYNOPSIS -------- -'git-revert' [--edit | --no-edit] [-n] [-m parent-number] <commit> +'git-revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit> DESCRIPTION ----------- @@ -51,6 +51,9 @@ OPTIONS This is useful when reverting more than one commits' effect to your working tree in a row. +-s|--signoff:: + Add Signed-off-by line at the end of the commit message. + Author ------ |