summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
AgeCommit message (Expand)Author
2006-09-25Deprecate merge-recursive.pyJunio C Hamano
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-02-02merge-recursive: Make use of provided basesFredrik Kuivinen
2006-01-29merge-recursive: Improve the error message printed when merge(1) isn't found.Fredrik Kuivinen
2005-12-22merge-recursive: conflicting rename case.Junio C Hamano
2005-12-11merge-recursive: cleanup setIndexStagesJunio C Hamano
2005-12-11merge-recursive: leave unmerged entries in the index.Junio C Hamano
2005-12-02merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano
2005-11-30merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano
2005-11-20merge-recursive: Replace 'except:'Fredrik Kuivinen
2005-11-20merge-recursive::removeFile: remove empty directoriesJunio C Hamano
2005-11-16Give python a chance to find "backported" modulesJohannes Schindelin
2005-11-12merge-recursive: Use '~' instead of '_' to separate file names from branch namesFredrik Kuivinen
2005-11-12merge-recursive: Add copyright noticeFredrik Kuivinen
2005-11-12merge-recursive: Indent the output properlyFredrik Kuivinen
2005-11-09merge-recursive: Fix support for branch names containing slashesFredrik Kuivinen
2005-11-09merge-recursive: Fix limited output of rename messagesFredrik Kuivinen
2005-11-08merge-recursive: Only print relevant rename messagesFredrik Kuivinen
2005-10-10Deal with $(bindir) and friends with whitespaces.Junio C Hamano
2005-10-02[PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen
2005-09-25[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.Fredrik Kuivinen
2005-09-14git-merge-recursive: Trivial RE fixes.Junio C Hamano
2005-09-13[PATCH] Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen
2005-09-13[PATCH] Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen
2005-09-13[PATCH] Don't output 'Automatic merge failed, ...'Fredrik Kuivinen
2005-09-13[PATCH] Be more like the 'resolve' strategy.Fredrik Kuivinen
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen