summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-211-11/+27
* merge-recursive: cleanup setIndexStagesJunio C Hamano2005-12-111-12/+5
* merge-recursive: leave unmerged entries in the index.Junio C Hamano2005-12-111-8/+46
* merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano2005-12-011-1/+1
* merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano2005-11-301-2/+0
* merge-recursive: Replace 'except:'Fredrik Kuivinen2005-11-201-2/+2
* merge-recursive::removeFile: remove empty directoriesJunio C Hamano2005-11-191-0/+4
* Give python a chance to find "backported" modulesJohannes Schindelin2005-11-151-2/+4
* merge-recursive: Use '~' instead of '_' to separate file names from branch namesFredrik Kuivinen2005-11-111-2/+2
* merge-recursive: Add copyright noticeFredrik Kuivinen2005-11-111-0/+3
* merge-recursive: Indent the output properlyFredrik Kuivinen2005-11-111-61/+69
* merge-recursive: Fix support for branch names containing slashesFredrik Kuivinen2005-11-091-0/+1
* merge-recursive: Fix limited output of rename messagesFredrik Kuivinen2005-11-091-8/+4
* merge-recursive: Only print relevant rename messagesFredrik Kuivinen2005-11-071-7/+15
* Deal with $(bindir) and friends with whitespaces.Junio C Hamano2005-10-101-1/+1
* [PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen2005-10-021-185/+601
* [PATCH] recursive-merge: Don't print a stack trace when read-tree fails.Fredrik Kuivinen2005-09-251-3/+9
* git-merge-recursive: Trivial RE fixes.Junio C Hamano2005-09-131-2/+2
* [PATCH] Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen2005-09-131-5/+18
* [PATCH] Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen2005-09-131-4/+4
* [PATCH] Don't output 'Automatic merge failed, ...'Fredrik Kuivinen2005-09-131-1/+0
* [PATCH] Be more like the 'resolve' strategy.Fredrik Kuivinen2005-09-131-35/+33
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-131-0/+429
View Lorry Controller Status