]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e65cdde 03415ca)
Merge branch 'jk/rm-removed-paths'
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 21:33:14 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 21:33:14 +0000 (14:33 -0700)
commit0f3d66c6dc0c6915888fbf928de0ae22739abc70
tree6d9ef01cc818a63d7001c06cc305c4a326787926tree | snapshot
parente65cdde45444a9cb297d4ff8f18d1eb5529cdce4commit | diff
parent03415ca8db28e67ca04e04126b42f38a90c825decommit | diff
Merge branch 'jk/rm-removed-paths'

A handful of test cases and a corner case bugfix for "git rm".

* jk/rm-removed-paths:
  t3600: document failure of rm across symbolic links
  t3600: test behavior of reverse-d/f conflict
  rm: do not complain about d/f conflicts during deletion
dir.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.