diff options
| author |  Neil Horman <nhorman@tuxdriver.com> | 2012-04-20 10:36:16 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-04-24 14:52:13 -0700 |
| commit | bedfe86ce6ccee90e2cbecbf8d72e06219a2768a (patch) | |
| tree | 7fb8633f94102bd2602d54439fe13897d61bda7e /builtin/merge-recursive.c | |
| parent | git-cherry-pick: Add keep-redundant-commits option (diff) | |
| download | tgif-bedfe86ce6ccee90e2cbecbf8d72e06219a2768a.tar.xz | |
git-cherry-pick: Add test to validate new options
Since we've added the --allow-empty and --keep-redundant-commits
options to git cherry-pick we should also add a test to ensure that its working
properly.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions