merge-recursive: handle D/F conflict case more carefully.
[git] / git-archimport.perl
2006-03-02  Junio C HamanoMerge part of 'lt/rev-list' into 'fk/blame'
2006-03-02  Junio C HamanoMerge branch 'master' into next
2006-03-02  Junio C HamanoMerge branch 'ml/cvsserver' into next
2006-03-02  Junio C HamanoMerge branch 'np/delta' into next
2006-03-02  Junio C HamanoMerge branch 'ml/cvsserver' into next
2006-03-02  Junio C HamanoMerge branch 'jc/tag' into next
2006-03-02  Junio C HamanoPull GIT 1.2.4 fixes from master
2006-03-02  Junio C HamanoMerge branch 'jc/diff' into next
2006-03-01  Junio C HamanoMerge branch 'lt/rev-list' into next
2006-03-01  Linus TorvaldsRip out merge-order and make "git log <paths>..." work...
2006-02-25  Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin'
2006-02-25  Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin'
2006-02-24  Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin' into...
2006-02-23  Junio C HamanoMerge part of pack-thin branch
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22  Junio C HamanoMerge branch 'jc/pack-reuse'
2006-02-22  Junio C HamanoMerge branch 'jc/nostat'
2006-02-22  Junio C HamanoMerge branch 'js/portable'
2006-02-21  Junio C HamanoMerge part of jc/portable branch
2006-02-21  Junio C HamanoMerge branch 'lt/merge-tree'
2006-02-21  Junio C HamanoMerge branch 'jc/ident'
2006-02-20  Junio C HamanoMerge branch 'jc/pack-thin' into next
2006-02-20  Junio C HamanoMerge branch 'jc/pack-thin' into next
2006-02-20  Junio C HamanoMerge branch 'js/portable' into next
2006-02-20  Junio C HamanoMerge branch 'jc/merge-msg'
2006-02-20  Junio C HamanoMerge branch 'jc/merge-msg' into next
2006-02-19  Junio C HamanoMerge branch 'jc/mv' into next
2006-02-19  Junio C HamanoMerge fixes up to GIT 1.2.2
2006-02-18  Eric Wongarchimport: remove files from the index before adding...
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-21  Junio C HamanoGIT 1.0.0 v1.0.0
2005-12-19  Eric WongDocumentation/git-archimport: document -o, -a, f, ...
2005-12-12  Junio C HamanoGIT 0.99.9m aka 1.0rc5 v0.99.9m v1.0rc5
2005-12-11  Eric Wongarchimport: fix a in new changeset applyer addition
2005-12-11  Eric Wongarchimport: Fix a bug I introduced in the new log parser
2005-12-11  Eric Wongarchimport: Add the accurate changeset applyer
2005-12-11  Eric Wongarchimport: safer log file parsing
2005-12-11  Eric Wongarchimport: add -D <depth> and -a switch
2005-12-11  Eric Wongarchimport: remove git wrapper dependency
2005-12-11  Eric Wongarchimport: fix -t tmpdir switch
2005-12-11  Eric Wongarchimport: remove String::ShellQuote dependency.
2005-12-11  Eric Wongarchimport: first, make sure it still compiles
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
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-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-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-18  Junio C HamanoMerge branch 'master'
2005-11-17  Junio C HamanoMerge branch 'tojunio' of locke.catalyst.net.nz/git...
2005-11-17  Martin Langhoffarchimport: allow for old style branch and public tag...
2005-11-17  Eric WongDisambiguate the term 'branch' in Arch vs git
2005-11-17  Eric Wongarchimport: don't die on merge-base failure
2005-11-17  Eric Wongremove shellquote usage for tags
2005-11-17  Junio C HamanoGIT 0.99.9j aka 1.0rc3 v0.99.9j v1.0rc3
2005-11-16  Pavel Roskinsymref support for import scripts
2005-11-12  Junio C HamanoGIT 0.99.9h v0.99.9h v1.0rc1
2005-11-11  Martin Langhoffarchimport: handle pika escaping
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git
2005-10-02  Martin Langhoff[PATCH] archimport: Actually cope with merges from...
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-12  Junio C HamanoMerge branch 'master' of .
2005-09-11  martin@catalyst... [PATCH] archimport - better handling of temp dirs
2005-09-11  martin@catalyst... [PATCH] archimport - use GIT_DIR instead of hardcoded...
2005-09-11  martin@catalyst... [PATCH] archimport - update in-script doco, options...
2005-09-10  martin@catalyst... [PATCH] archimport - add merge detection
2005-09-08  Junio C HamanoBig tool rename.