projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Refactor merge strategies into separate includable file.
[git] / git-merge-recursive.py
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2005-10-23  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-21  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-18  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-16  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-16  Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git blob | commitdiff | raw
2005-10-15  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-12  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-10  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw
2005-10-10  Junio C HamanoDeal with $(bindir) and friends with whitespaces. blob | commitdiff | raw
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git blob | commitdiff | raw | diff to current
2005-10-02  Fredrik Kuivinen[PATCH] Teach the recursive merge strategy about renames. blob | commitdiff | raw | diff to current
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-09-25  Fredrik Kuivinen[PATCH] recursive-merge: Don't print a stack trace... blob | commitdiff | raw | diff to current
2005-09-14  Junio C HamanoMerge branch 'master' of . blob | commitdiff | raw | diff to current
2005-09-14  Junio C Hamanogit-merge-recursive: Trivial RE fixes. blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Use a temporary index file when we merge the... blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Adjust git-merge-recursive.py for the new tool... blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Don't output 'Automatic merge failed, ...' blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Be more like the 'resolve' strategy. blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'. blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.