Code

Merge branch 'jc/name' into next
[git.git] / git-merge-recursive.py
2006-02-22 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-02 Fredrik Kuivinenmerge-recursive: Make use of provided bases
2006-01-30 Junio C HamanoMerge fixes up to GIT 1.1.6
2006-01-30 Junio C HamanoGIT 1.1.6 v1.1.6
2006-01-29 Fredrik Kuivinenmerge-recursive: Improve the error message printed...
2006-01-27 Junio C HamanoGIT 1.1.5 v1.1.5
2006-01-20 Junio C HamanoGIT 1.1.4 v1.1.4
2006-01-16 Junio C HamanoGIT 1.1.3 v1.1.3
2006-01-16 Junio C HamanoMerge branch 'fixo/1.0'
2006-01-14 Junio C HamanoGIT 1.1.2 v1.1.2
2006-01-11 Junio C HamanoGIT 1.1.1 v1.1.1
2006-01-08 Junio C HamanoGIT 1.1.0 v1.1.0
2006-01-06 Junio C HamanoMerge fixes up to GIT 1.0.7
2005-12-28 Junio C HamanoMerge fixes up to GIT 1.0.6
2005-12-27 Junio C HamanoMerge fixes up to GIT 1.0.5
2005-12-24 Junio C HamanoMerge fixes up to GIT 1.0.4
2005-12-23 Junio C HamanoMerge in fixes up to 1.0.3 maintenance branch.
2005-12-22 Junio C HamanoMerge branch 'fixes'
2005-12-22 Junio C Hamanomerge-recursive: conflicting rename case.
2005-12-12 Junio C HamanoGIT 0.99.9m aka 1.0rc5 v0.99.9m v1.0rc5
2005-12-11 Junio C Hamanomerge-recursive: cleanup setIndexStages
2005-12-11 Junio C Hamanomerge-recursive: leave unmerged entries in the index.
2005-12-07 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4
2005-12-02 Junio C Hamanomerge-recursive: adjust git-ls-tree use for the latest.
2005-11-30 Junio C HamanoMerge branch 'jc/subdir'
2005-11-30 Junio C HamanoMerge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect...
2005-11-30 Junio C Hamanomerge-recursive: match the unmerged index entry behavio...
2005-11-29 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-26 Junio C HamanoGIT 0.99.9k v0.99.9k
2005-11-22 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Fredrik Kuivinenmerge-recursive: Replace 'except:'
2005-11-20 Junio C Hamanomerge-recursive::removeFile: remove empty directories
2005-11-19 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-17 Junio C HamanoGIT 0.99.9j aka 1.0rc3 v0.99.9j v1.0rc3
2005-11-16 Johannes SchindelinGive python a chance to find "backported" modules
2005-11-12 Junio C HamanoGIT 0.99.9h v0.99.9h v1.0rc1
2005-11-12 Fredrik Kuivinenmerge-recursive: Use '~' instead of '_' to separate...
2005-11-12 Fredrik Kuivinenmerge-recursive: Add copyright notice
2005-11-12 Fredrik Kuivinenmerge-recursive: Indent the output properly
2005-11-10 Junio C HamanoGIT 0.99.9g v0.99.9g
2005-11-10 Junio C HamanoMerge branch 'hold/svn'
2005-11-10 Junio C HamanoMerge branch 'hold/rpm'
2005-11-09 Fredrik Kuivinenmerge-recursive: Fix support for branch names containin...
2005-11-09 Fredrik Kuivinenmerge-recursive: Fix limited output of rename messages
2005-11-08 Junio C HamanoMerge branch 'master'
2005-11-08 Fredrik Kuivinenmerge-recursive: Only print relevant rename messages
2005-11-07 Junio C HamanoGIT 0.99.9e v0.99.9e
2005-10-31 Junio C HamanoGIT 0.99.9a v0.99.9a
2005-10-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Junio C HamanoMerge branch 'fixes'
2005-10-21 Junio C HamanoMerge branch 'fixes'
2005-10-18 Junio C HamanoMerge branch 'fixes'
2005-10-16 Junio C HamanoMerge branch 'fixes'
2005-10-16 Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git
2005-10-15 Junio C HamanoMerge branch 'fixes'
2005-10-12 Junio C HamanoMerge branch 'fixes'
2005-10-10 Junio C HamanoMerge branch 'fixes'
2005-10-10 Junio C HamanoDeal with $(bindir) and friends with whitespaces.
2005-10-03 Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git
2005-10-02 Fredrik Kuivinen[PATCH] Teach the recursive merge strategy about renames.
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-25 Fredrik Kuivinen[PATCH] recursive-merge: Don't print a stack trace...
2005-09-14 Junio C HamanoMerge branch 'master' of .
2005-09-14 Junio C Hamanogit-merge-recursive: Trivial RE fixes.
2005-09-13 Fredrik Kuivinen[PATCH] Use a temporary index file when we merge the...
2005-09-13 Fredrik Kuivinen[PATCH] Adjust git-merge-recursive.py for the new tool...
2005-09-13 Fredrik Kuivinen[PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13 Fredrik Kuivinen[PATCH] Be more like the 'resolve' strategy.
2005-09-13 Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.