1. 64b1abe merge-recursive: fix overwriting dirty files involved in renames by Elijah Newren · 7 years ago
  2. 8b026ed Revert "Merge branch 'en/rename-directory-detection'" by Junio C Hamano · 7 years ago
  3. e0052f4 merge-recursive: fix overwriting dirty files involved in renames by Elijah Newren · 7 years ago
  4. 7c5585f Tighten and correct a few testcases for merging and cherry-picking by Elijah Newren · 7 years ago
  5. 67166a8 Merge branch 'ah/unpack-trees-advice-messages' by Junio C Hamano · 9 years ago
  6. c2691e2 unpack-trees: fix English grammar in do-this-before-that messages by Alex Henrie · 9 years ago
  7. e5c1272 tests: unpack-trees: update to use test_i18n* functions by Vasco Almeida · 9 years ago
  8. 889c6f0 tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) by Johannes Sixt · 12 years ago
  9. 30fd3a5 merge overwrites unstaged changes in renamed file by Clemens Buchacher · 13 years ago
  10. 6f90969 unpack-trees: print "Aborting" to stderr by Michael J Gruber · 13 years ago
  11. c9ea118 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 by Junio C Hamano · 14 years ago
  12. 6c80cd2 Merge branch 'ab/i18n-st' by Junio C Hamano · 14 years ago
  13. 97b1b4f merge: merge unborn index before setting ref by Jeff King · 14 years ago
  14. d6d9e76 t7607: clean up stray untracked file by Jeff King · 14 years ago
  15. 8523d07 t7607: mark known breakage in test 11 as fixed by Jeff King · 14 years ago
  16. bacec47 i18n: git-merge basic messages by Ævar Arnfjörð Bjarmason · 14 years ago
  17. 1a9fe45 Merge branch 'tr/merge-unborn-clobber' by Junio C Hamano · 14 years ago
  18. 208247a Merge branch 'cb/leading-path-removal' by Junio C Hamano · 14 years ago
  19. 7d43de9 Merge branch 'cb/maint-orphan-merge-noclobber' by Junio C Hamano · 14 years ago
  20. 7980872 use persistent memory for rejected paths by Clemens Buchacher · 14 years ago
  21. 172b642 do not overwrite untracked during merge from unborn branch by Clemens Buchacher · 14 years ago
  22. f66caaf do not overwrite files in leading path by Clemens Buchacher · 14 years ago
  23. 189645c t7607: add leading-path tests by Clemens Buchacher · 14 years ago
  24. 52a0a1b t7607: use test-lib functions and check MERGE_HEAD by Clemens Buchacher · 14 years ago
  25. 5b32708 Exhibit merge bug that clobbers index&WT by Thomas Rast · 15 years ago
  26. ce14e0b Convert "! git" to "test_must_fail git" by Jared Hance · 15 years ago
  27. c5ab03f merge-recursive: do not clobber untracked working tree garbage by Junio C Hamano · 16 years ago
  28. 7bb1fcc modify/delete conflict resolution overwrites untracked file by Clemens Buchacher · 16 years ago