diff options
| author | Chris Webb <chris@arachsys.com> | 2012-08-02 12:38:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 18:59:53 +0200 |
| commit | 4bee958479bed1d3a8f20a75f33422ee49939dbf (patch) | |
| tree | e24a4ea9b183c3eb9c5bea21caf0c6d5ff0bf4ee /Documentation | |
| parent | Git 1.7.11-rc1 (diff) | |
| download | git-4bee958479bed1d3a8f20a75f33422ee49939dbf.tar.xz git-4bee958479bed1d3a8f20a75f33422ee49939dbf.zip | |
cherry-pick: add --allow-empty-message option
Scripts such as "git rebase -i" cannot currently cherry-pick commits
which have an empty commit message, as git cherry-pick calls git
commit without the --allow-empty-message option.
Add an --allow-empty-message option to git cherry-pick which is passed
through to git commit, so this behaviour can be overridden.
Signed-off-by: Chris Webb <chris@arachsys.com>
Reviewed-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 9f3dae631e..ba1edb8251 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -116,6 +116,11 @@ effect to your index in a row. previous commit are dropped. To force the inclusion of those commits use `--keep-redundant-commits`. +--allow-empty-message:: + By default, cherry-picking a commit with an empty message will fail. + This option overrides that behaviour, allowing commits with empty + messages to be cherry picked. + --keep-redundant-commits:: If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these |