diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:54:04 -0700 |
| commit | 329351feeb0c08c835ac4ff05f127fbfe42a78cf (patch) | |
| tree | 9c6d18cb13544077b05783defd525c7440d7bc68 /block-sha1 | |
| parent | 9b1054d93e7e8564d0d9865cb7118cb6e756c74b (diff) | |
| parent | 37ab5156ae31ec81e3489406f23be6936a2a370c (diff) | |
| download | git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.tar.gz | |
Merge branch 'kb/merge-recursive-rename-threshold'
* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold
Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt
Diffstat (limited to 'block-sha1')
0 files changed, 0 insertions, 0 deletions