1. b539c5e git-merge-one: new merge world order. by Junio C Hamano · 19 years ago
  2. be61db9 git-merge-one-file: resurrect leading path creation. by Junio C Hamano · 19 years ago
  3. 54dd99a merge-one-file: make sure we do not mismerge symbolic links. by Junio C Hamano · 19 years ago
  4. 1c2c10b merge-one-file: make sure we create the merged file. by Junio C Hamano · 19 years ago
  5. ce3ca27 git-merge-one-file: do not worry about 'rmdir -p' not removing directory. by Junio C Hamano · 19 years ago
  6. 354b9b5 merge-one-file: leave unmerged index entries upon automerge failure. by Linus Torvalds · 19 years ago
  7. 9ae2172 merge-one-file: use rmdir -p by Junio C Hamano · 19 years ago
  8. 397c766 merge-one-file: remove empty directories by Junio C Hamano · 19 years ago
  9. fd66dbf merge-one-file: use empty- or common-base condintionally in two-stage merge. by Junio C Hamano · 19 years ago
  10. cb93c19 merge-one-file: use common as base, instead of emptiness. by Junio C Hamano · 19 years ago
  11. f7d24bb merge with /dev/null as base, instead of punting O==empty case by Junio C Hamano · 19 years ago
  12. 215a7ad Big tool rename. by Junio C Hamano · 19 years ago[Renamed (81%) from git-merge-one-file-script]
  13. cdcb0ed [PATCH] Make "git resolve" less scary by Linus Torvalds · 19 years ago
  14. 0b124bb [PATCH] Trivial tidyups by Petr Baudis · 19 years ago
  15. aacc15e [PATCH] git-merge-one-file-script: do not misinterpret rm failure. by Junio C Hamano · 20 years ago
  16. 98a96b0 One more time.. Clean up git-merge-one-file-script by Linus Torvalds · 20 years ago
  17. e0226ad Fix up git-merge-one-file-script by Linus Torvalds · 20 years ago
  18. 566487c Merge my and Petr's git-merge-one-file-script modifications by Linus Torvalds · 20 years ago
  19. ec73962 [PATCH] git-merge-one-file-script cleanups from Cogito by Petr Baudis · 20 years ago
  20. ae3858e Make sure we error out if we can't remove a file on automatic merges. by Linus Torvalds · 20 years ago
  21. 8544a6f [PATCH] Fix git-merge-one-file permissions auto-merging by Petr Baudis · 20 years ago
  22. 2a68a86 Leave merge failures in the filesystem by Linus Torvalds · 20 years ago
  23. c7d1d4e Use backticks in git-merge-one-file-script instead of $(command). by Junio C Hamano · 20 years ago
  24. ee28152 Update git-merge-one-file-script. by Junio C Hamano · 20 years ago
  25. 21a08dc [PATCH] Really fix git-merge-one-file-script this time. by Junio C Hamano · 20 years ago
  26. 0fc65a4 [PATCH] leftover bits for git rename by Junio C Hamano · 20 years ago
  27. 2d280e1 Update the merge scripts for the big git rename. by Linus Torvalds · 20 years ago
  28. e2b6a9d [PATCH] make file merging respect permissions by James Bottomley · 20 years ago
  29. 0a9ea85 [PATCH] SCSI trees, merges and git status by James Bottomley · 20 years ago
  30. e3b4be7 Change merge-cache and git-merge-one-file to use the SHA1 of the file by Linus Torvalds · 20 years ago
  31. 839a7a0 Add the simple scripts I used to do a merge with content conflicts. by Linus Torvalds · 20 years ago