projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
GIT 0.99.9k
[git] / git-merge-recursive.py
2005-11-26  Junio C HamanoGIT 0.99.9k v0.99.9k blob | commitdiff | raw
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2005-11-20  Fredrik Kuivinenmerge-recursive: Replace 'except:' blob | commitdiff | raw
2005-11-20  Junio C Hamanomerge-recursive::removeFile: remove empty directories blob | commitdiff | raw | diff to current
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-17  Junio C HamanoGIT 0.99.9j aka 1.0rc3 v0.99.9j v1.0rc3 blob | commitdiff | raw | diff to current
2005-11-16  Johannes SchindelinGive python a chance to find "backported" modules blob | commitdiff | raw | diff to current
2005-11-12  Junio C HamanoGIT 0.99.9h v0.99.9h v1.0rc1 blob | commitdiff | raw | diff to current
2005-11-12  Fredrik Kuivinenmerge-recursive: Use '~' instead of '_' to separate... blob | commitdiff | raw | diff to current
2005-11-12  Fredrik Kuivinenmerge-recursive: Add copyright notice blob | commitdiff | raw | diff to current
2005-11-12  Fredrik Kuivinenmerge-recursive: Indent the output properly blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoGIT 0.99.9g v0.99.9g blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoMerge branch 'hold/svn' blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoMerge branch 'hold/rpm' blob | commitdiff | raw | diff to current
2005-11-09  Fredrik Kuivinenmerge-recursive: Fix support for branch names containin... blob | commitdiff | raw | diff to current
2005-11-09  Fredrik Kuivinenmerge-recursive: Fix limited output of rename messages blob | commitdiff | raw | diff to current
2005-11-08  Junio C HamanoMerge branch 'master' blob | commitdiff | raw | diff to current
2005-11-08  Fredrik Kuivinenmerge-recursive: Only print relevant rename messages blob | commitdiff | raw | diff to current
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e blob | commitdiff | raw | diff to current
2005-10-31  Junio C HamanoGIT 0.99.9a v0.99.9a blob | commitdiff | raw | diff to current
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-10-23  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-21  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-18  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-16  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-16  Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git blob | commitdiff | raw | diff to current
2005-10-15  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-12  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-10  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-10  Junio C HamanoDeal with $(bindir) and friends with whitespaces. blob | commitdiff | raw | diff to current
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.