diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-02-10 01:41:16 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 01:41:16 +0100 |
commit | 06938a37dca9bb19784c1bd41e90c99a7c8f8e5e (patch) | |
tree | 25be5b409d7bba815b9e99abc2ccdb4a0230ed2c /Makefile | |
parent | Merge branch 'maint-1.7.0' into maint (diff) | |
parent | cherry-pick/revert: add support for -X/--strategy-option (diff) | |
download | git-06938a37dca9bb19784c1bd41e90c99a7c8f8e5e.tar.xz git-06938a37dca9bb19784c1bd41e90c99a7c8f8e5e.zip |
Merge branch 'jn/cherry-pick-strategy-option'
* jn/cherry-pick-strategy-option:
cherry-pick/revert: add support for -X/--strategy-option
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions