summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
AgeCommit message (Expand)AuthorFilesLines
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-1/+1
2006-02-02merge-recursive: Make use of provided basesLibravatar Fredrik Kuivinen1-10/+21
2006-01-29merge-recursive: Improve the error message printed when merge(1) isn't found.Libravatar Fredrik Kuivinen1-5/+10
2005-12-21merge-recursive: conflicting rename case.Libravatar Junio C Hamano1-11/+27
2005-12-11merge-recursive: cleanup setIndexStagesLibravatar Junio C Hamano1-12/+5
2005-12-11merge-recursive: leave unmerged entries in the index.Libravatar Junio C Hamano1-8/+46
2005-12-01merge-recursive: adjust git-ls-tree use for the latest.Libravatar Junio C Hamano1-1/+1
2005-11-30merge-recursive: match the unmerged index entry behaviour with merge-resolveLibravatar Junio C Hamano1-2/+0
2005-11-20merge-recursive: Replace 'except:'Libravatar Fredrik Kuivinen1-2/+2
2005-11-19merge-recursive::removeFile: remove empty directoriesLibravatar Junio C Hamano1-0/+4
2005-11-15Give python a chance to find "backported" modulesLibravatar Johannes Schindelin1-2/+4
2005-11-11merge-recursive: Use '~' instead of '_' to separate file names from branch namesLibravatar Fredrik Kuivinen1-2/+2
2005-11-11merge-recursive: Add copyright noticeLibravatar Fredrik Kuivinen1-0/+3
2005-11-11merge-recursive: Indent the output properlyLibravatar Fredrik Kuivinen1-61/+69
2005-11-09merge-recursive: Fix support for branch names containing slashesLibravatar Fredrik Kuivinen1-0/+1
2005-11-09merge-recursive: Fix limited output of rename messagesLibravatar Fredrik Kuivinen1-8/+4
2005-11-07merge-recursive: Only print relevant rename messagesLibravatar Fredrik Kuivinen1-7/+15
2005-10-10Deal with $(bindir) and friends with whitespaces.Libravatar Junio C Hamano1-1/+1
2005-10-02[PATCH] Teach the recursive merge strategy about renames.Libravatar Fredrik Kuivinen1-185/+601
2005-09-25[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.Libravatar Fredrik Kuivinen1-3/+9
2005-09-13git-merge-recursive: Trivial RE fixes.Libravatar Junio C Hamano1-2/+2
2005-09-13[PATCH] Use a temporary index file when we merge the common ancestors.Libravatar Fredrik Kuivinen1-5/+18
2005-09-13[PATCH] Adjust git-merge-recursive.py for the new tool names.Libravatar Fredrik Kuivinen1-4/+4
2005-09-13[PATCH] Don't output 'Automatic merge failed, ...'Libravatar Fredrik Kuivinen1-1/+0
2005-09-13[PATCH] Be more like the 'resolve' strategy.Libravatar Fredrik Kuivinen1-35/+33
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Libravatar Fredrik Kuivinen1-0/+429
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 23:07:51 +0000