diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-21 12:12:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-21 12:12:21 -0700 |
| commit | c809f4258fb066078b401cfead578a7bb855a2cb (patch) | |
| tree | 230d8c96225286ab113369f14f35e2ccc628691f /Documentation | |
| parent | c84364abe3f7da3fdef67cc0f8762eabe2a71710 (diff) | |
| parent | f907282faf9ffa90da8978c5a0dad44c299d06da (diff) | |
| download | git-c809f4258fb066078b401cfead578a7bb855a2cb.tar.gz | |
Merge branch 'jk/cherry-pick-docfix' into maint
* jk/cherry-pick-docfix:
cherry-pick: fix docs describing handling of empty commits
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 1c03c792b0..1147c71da6 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -131,7 +131,8 @@ effect to your index in a row. --keep-redundant-commits:: If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these - redundant commits are ignored. This option overrides that behavior and + redundant commits cause `cherry-pick` to stop so the user can + examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`. --strategy=<strategy>:: |