diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
| commit | 0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9 (patch) | |
| tree | 999ed87a9453af4848bf98a3341ceaf0801c6f95 /Documentation/git-difftool.txt | |
| parent | Merge branch 'maint' (diff) | |
| parent | pull: propagate --progress to merge (diff) | |
| download | tgif-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.xz | |
Merge branch 'jk/merge-rename-ux'
* jk/merge-rename-ux:
pull: propagate --progress to merge
merge: enable progress reporting for rename detection
add inexact rename detection progress infrastructure
commit: stop setting rename limit
bump rename limit defaults (again)
merge: improve inexact rename limit warning
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions