aboutsummaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
Commit message (Expand)AuthorAge
* Fix more typos, primarily in the codePavel Roskin2006-07-10
* merge-recursive: Make use of provided basesFredrik Kuivinen2006-02-02
* merge-recursive: Improve the error message printed when merge(1) isn't found.Fredrik Kuivinen2006-01-29
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-21
* merge-recursive: cleanup setIndexStagesJunio C Hamano2005-12-11
* merge-recursive: leave unmerged entries in the index.Junio C Hamano2005-12-11
* merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano2005-12-01
* merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano2005-11-30
* merge-recursive: Replace 'except:'Fredrik Kuivinen2005-11-20
* merge-recursive::removeFile: remove empty directoriesJunio C Hamano2005-11-19
* Give python a chance to find "backported" modulesJohannes Schindelin2005-11-15
* merge-recursive: Use '~' instead of '_' to separate file names from branch namesFredrik Kuivinen2005-11-11
* merge-recursive: Add copyright noticeFredrik Kuivinen2005-11-11
* merge-recursive: Indent the output properlyFredrik Kuivinen2005-11-11
* merge-recursive: Fix support for branch names containing slashesFredrik Kuivinen2005-11-09
* merge-recursive: Fix limited output of rename messagesFredrik Kuivinen2005-11-09
* merge-recursive: Only print relevant rename messagesFredrik Kuivinen2005-11-07
* Deal with $(bindir) and friends with whitespaces.Junio C Hamano2005-10-10
* [PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen2005-10-02
* [PATCH] recursive-merge: Don't print a stack trace when read-tree fails.Fredrik Kuivinen2005-09-25
* git-merge-recursive: Trivial RE fixes.Junio C Hamano2005-09-13
* [PATCH] Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen2005-09-13
* [PATCH] Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen2005-09-13
* [PATCH] Don't output 'Automatic merge failed, ...'Fredrik Kuivinen2005-09-13
* [PATCH] Be more like the 'resolve' strategy.Fredrik Kuivinen2005-09-13
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-13
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 23:05:17 +0000