Merge branch 'master'
[gitweb.git] / gitMergeCommon.py
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1
2005-11-12 merge-recursive: Add copyright notice
2005-11-07 GIT 0.99.9e v0.99.9e
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git
2005-10-03 Merge branch 'fixes'
2005-10-03 [PATCH] Enable and fix support for base less merges.
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-20 Ship our own copy of subprocess.py
2005-09-14 Merge branch 'master' of .
2005-09-13 [PATCH] Use the 'die' function where it is appropriate.
2005-09-13 Merge branch 'master' of .
2005-09-12 [PATCH] Make the ProgramError class printable.
2005-09-12 [PATCH] Introduce a 'die' function.
2005-09-11 Add a new merge strategy by Fredrik Kuivinen.