diff options
| author | Kevin Ballard <kevin@sb.org> | 2010-09-28 03:58:26 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 00:18:04 +0400 |
| commit | 37ab5156ae31ec81e3489406f23be6936a2a370c (patch) | |
| tree | 280cabc021786a0e33e3413bf4d8b43a6fc247eb /merge-recursive.h | |
| parent | 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 (diff) | |
diff: add synonyms for -M, -C, -B
Add new long-form options --detect-renames[=<n>], --detect-copies[=<n>],
and --break-rewrites[=[<n>][/<m>]] as synonyms for the -M, -C, and -B
options (respectively).
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions