projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
[PATCH] Adjust git-merge-recursive.py for the new tool names.
[git.git] / git-merge-recursive.py
2005-09-13 Fredrik Kuivinen[PATCH] Adjust git-merge-recursive.py for the new tool... blob | commitdiff
2005-09-13 Fredrik Kuivinen[PATCH] Don't output 'Automatic merge failed, ...' blob | commitdiff | diff to current
2005-09-13 Fredrik Kuivinen[PATCH] Be more like the 'resolve' strategy. blob | commitdiff | diff to current
2005-09-13 Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'. blob | commitdiff | diff to current
The core git plumbing