projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: edf9d71 bebd2fd)
Merge branch 'jk/merge-rename-ux'
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:23:56 +0000 (23:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:23:56 +0000 (23:23 -0700)
commit0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9
tree999ed87a9453af4848bf98a3341ceaf0801c6f95tree | snapshot
parentedf9d719d1d05c1eb4f652782febfdfede212648commit | diff
parentbebd2fd77d385f198017fe297a6c79e26b2bf61ccommit | diff
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
builtin/commit.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
diffcore-rename.c diff1 | diff2 | blob | history
git-pull.sh diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
merge-recursive.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.