Google Git
Sign in
googlers / jrn / git / 393e3b1910221da5a78f7f79a45507b5fde59b77 / git-merge-recursive.py
  1. 008bb6e merge-recursive: Make use of provided bases by Fredrik Kuivinen · 19 years ago
  2. 4353f38 merge-recursive: Improve the error message printed when merge(1) isn't found. by Fredrik Kuivinen · 19 years ago
  3. 724b511 merge-recursive: conflicting rename case. by Junio C Hamano · 19 years ago
  4. 157dc07 merge-recursive: cleanup setIndexStages by Junio C Hamano · 19 years ago
  5. 28e77a8 merge-recursive: leave unmerged entries in the index. by Junio C Hamano · 19 years ago
  6. a6b51f1 merge-recursive: adjust git-ls-tree use for the latest. by Junio C Hamano · 19 years ago
  7. 58cce8a merge-recursive: match the unmerged index entry behaviour with merge-resolve by Junio C Hamano · 19 years ago
  8. a6322d0 merge-recursive: Replace 'except:' by Fredrik Kuivinen · 19 years ago
  9. 80e21a9 merge-recursive::removeFile: remove empty directories by Junio C Hamano · 19 years ago
  10. ad4f4da Give python a chance to find "backported" modules by Johannes Schindelin · 19 years ago
  11. e9af60c merge-recursive: Use '~' instead of '_' to separate file names from branch names by Fredrik Kuivinen · 19 years ago
  12. 857f26d merge-recursive: Add copyright notice by Fredrik Kuivinen · 19 years ago
  13. 46e6517 merge-recursive: Indent the output properly by Fredrik Kuivinen · 19 years ago
  14. 186f855 merge-recursive: Fix support for branch names containing slashes by Fredrik Kuivinen · 19 years ago
  15. c8a4f5e merge-recursive: Fix limited output of rename messages by Fredrik Kuivinen · 19 years ago
  16. d1745af merge-recursive: Only print relevant rename messages by Fredrik Kuivinen · 19 years ago
  17. 4769948 Deal with $(bindir) and friends with whitespaces. by Junio C Hamano · 19 years ago
  18. af21511 [PATCH] Teach the recursive merge strategy about renames. by Fredrik Kuivinen · 19 years ago
  19. 0bed189 [PATCH] recursive-merge: Don't print a stack trace when read-tree fails. by Fredrik Kuivinen · 19 years ago
  20. 74376a6 git-merge-recursive: Trivial RE fixes. by Junio C Hamano · 20 years ago
  21. 6511cce [PATCH] Use a temporary index file when we merge the common ancestors. by Fredrik Kuivinen · 20 years ago
  22. 87a71b6 [PATCH] Adjust git-merge-recursive.py for the new tool names. by Fredrik Kuivinen · 20 years ago
  23. 0d214b6 [PATCH] Don't output 'Automatic merge failed, ...' by Fredrik Kuivinen · 20 years ago
  24. d9a23fa [PATCH] Be more like the 'resolve' strategy. by Fredrik Kuivinen · 20 years ago
  25. e4cf17c [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. by Fredrik Kuivinen · 20 years ago[Renamed from git-merge-fredrik.py]
  26. 206e587 [PATCH] Make sure we die if we don't get enough arguments. by Fredrik Kuivinen · 20 years ago
  27. 654291a [PATCH] Introduce a 'die' function. by Fredrik Kuivinen · 20 years ago
  28. ace3685 [PATCH] Exit with status code 2 if we get an exception. by Fredrik Kuivinen · 20 years ago
  29. 8ceba72 [PATCH] Fix assertion failure when merging common ancestors. by Fredrik Kuivinen · 20 years ago
  30. 720d150 Add a new merge strategy by Fredrik Kuivinen. by Junio C Hamano · 20 years ago