]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d98a509 b9b3eef)
Merge branch 'en/merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:35 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:35 +0000 (14:11 -0700)
commitac9666f84a597973ef29dc7f0f7edcb3e1a3aa45
tree8603a2147eeff8893f88ff58a779e49dc9219e6btree | snapshot
parentd98a509ec3e9ff22bb642f778900691d0c715ba9commit | diff
parentb9b3eef76186d423efb684d01b3e99ef010a61decommit | diff
Merge branch 'en/merge-recursive'

* en/merge-recursive:
  merge-recursive: tweak magic band-aid
  merge-recursive: When we detect we can skip an update, actually skip it
  t6022: New test checking for unnecessary updates of files in D/F conflicts
  t6022: New test checking for unnecessary updates of renamed+modified files
merge-recursive.c diff1 | diff2 | blob | history
t/t6022-merge-rename.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.