Let merge set the default strategy.
[git] / Makefile
2006-03-13  Junio C HamanoMerge branch 'jc/pack'
2006-03-13  Junio C HamanoMerge branch 'jc/fsck'
2006-03-11  Mike McCormackAdd git-imap-send, derived from isync 1.0.1.
2006-03-09  Fredrik KuivinenNicer output from 'git'
2006-03-09  Nicolas Pitretest-delta needs zlib to compile
2006-03-08  Nick HengeveldUpdate http-push functionality
2006-03-06  Junio C Hamanoblame: avoid -lm by not using log().
2006-03-05  Fredrik Kuivinengit-blame: Make the output human readable
2006-03-05  Junio C HamanoCauterize dropped or duplicate bits from next.
2006-03-04  Junio C HamanoMerge part of 'sp/checkout'
2006-03-04  Junio C HamanoMerge branch 'fk/blame'
2006-03-04  Junio C HamanoMerge branch 'lt/rev-list'
2006-03-04  Junio C HamanoMerge branch 'maint'
2006-03-02  Junio C HamanoMerge part of 'lt/rev-list' into 'fk/blame'
2006-03-02  Junio C HamanoMerge branch 'ml/cvsserver'
2006-03-02  Junio C HamanoMerge branch 'master' into next
2006-03-02  Junio C HamanoMerge branch 'maint'
2006-03-02  Junio C HamanoMerge branch 'ml/cvsserver' into next
2006-03-02  Junio C HamanoMerge branch 'jc/tag'
2006-03-02  Junio C HamanoMerge part of 'jc/diff'
2006-03-02  Junio C HamanoMerge branch 'np/delta' into next
2006-03-02  Junio C HamanoMerge branch 'kh/svnimport'
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-02  Junio C HamanoUp to date with GIT 1.2.4 fixes
2006-03-02  Junio C HamanoMerge branch 'lt/apply'
2006-03-02  Junio C HamanoMerge early parts of 'np/delta' branch
2006-03-01  Junio C HamanoMerge git-mv fixes from 'maint'
2006-03-01  Junio C HamanoMerge branch 'lt/rev-list' 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-03-01  Junio C HamanoMerge part of 'jc/diff' into next
2006-03-01  Junio C HamanoMerge part of 'sp/checkout' into next
2006-03-01  Junio C HamanoMerge branch 'lt/apply' into next
2006-03-01  Junio C HamanoMerge branch 'js/refs' into next
2006-03-01  Junio C HamanoMerge branch 'cvsserver' of locke.catalyst.net.nz/git...
2006-03-01  Junio C Hamanodiffcore-rename: split out the delta counting code.
2006-02-28  Linus TorvaldsTie it all together: "git log"
2006-02-28  Linus TorvaldsIntroduce trivial new pager.c helper infrastructure
2006-02-28  Shawn PearceDarwin: Ignore missing /sw/lib
2006-02-28  Junio C HamanoMerge part of np/delta
2006-02-28  Junio C HamanoMerge branch 'lt/apply' into next
2006-02-27  Junio C HamanoMerge branch 'master' into next
2006-02-27  Junio C HamanoMerge branch 'lt/rev-list' into next
2006-02-27  Junio C HamanoMerge branch 'lt/apply' into next
2006-02-27  Junio C HamanoMerge branch 'kh/svnimport' into next
2006-02-27  Junio C HamanoMerge branch 'kh/svnimport' into next
2006-02-27  Junio C HamanoMerge branch 'lt/apply' into next
2006-02-27  Junio C HamanoMerge branch 'lt/rev-list' into next
2006-02-26  Junio C HamanoMerge branch 'lt/rev-list' into next
2006-02-26  Linus TorvaldsFirst cut at libifying revlist generation
2006-02-26  Junio C HamanoMerge branch 'maint'
2006-02-25  Junio C HamanoMerge branch 'master' into next
2006-02-25  Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin'
2006-02-25  Junio C HamanoMerge branch 'master' into next
2006-02-25  Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin'
2006-02-25  Junio C HamanoBuild and install git-mailinfo.
2006-02-24  Junio C HamanoMerge branch 'master' into next
2006-02-24  Junio C HamanoMerge fixes early for next maint series.
2006-02-24  Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin' into...
2006-02-24  Junio C HamanoMerge fix bits from jc/rev-list
2006-02-24  Junio C HamanoMerge branch 'np/delta' into next
2006-02-24  Junio C HamanoMerge fixes from master
2006-02-24  Junio C HamanoMerge branch 'jc/send-insane-refs'
2006-02-24  Junio C HamanoMerge fixes early for next maint series.
2006-02-24  Junio C HamanoMerge branch 'ak/gitview'
2006-02-23  Junio C HamanoMerge part of pack-thin branch
2006-02-23  Junio C HamanoMerge branch 'np/delta' into next
2006-02-23  Junio C HamanoMerge branches 'maint', 'jc/fix-co-candy' and 'jc/fix...
2006-02-23  Junio C HamanoMerge branch 'ml/cvs'
2006-02-23  Junio C HamanoMerge branch 'ra/anno'
2006-02-23  Junio C HamanoMerge branch 'cw/remove' into next
2006-02-23  Carl WorthAdd new git-rm command with documentation
2006-02-23  Junio C HamanoMerge master to get fixes up to GIT 1.2.3
2006-02-23  Junio C HamanoMerge fixes up to GIT 1.2.3
2006-02-22  Junio C HamanoMerge branch 'ml/cvs' into next
2006-02-22  Martin LanghoffIntroducing git-cvsserver -- a CVS emulator for git.
2006-02-22  Junio C HamanoMerge branch 'ra/anno' into next
2006-02-22  Junio C HamanoMerge branch 'jc/send-insane-refs' into next
2006-02-22  Junio C HamanoMerge part of np/delta
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22  Junio C HamanoMerge branch 'fix'
2006-02-22  Junio C HamanoMerge branch 'jc/perl'
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-22  Junio C HamanoMerge branch 'pj/portable'
2006-02-22  Johannes SchindelinFix "gmake -j"
2006-02-21  Junio C HamanoMerge branch 'fk/blame' into next
2006-02-21  Junio C HamanoMerge branch 'pj/portable' into next
2006-02-21  Paul JakmaMakefile tweaks: Solaris 9+ dont need iconv / move...
2006-02-21  Fredrik KuivinenAdd git-blame, a tool for assigning blame.
2006-02-21  Junio C HamanoMerge part of jc/portable branch
2006-02-21  Junio C Hamanogit-mktree: reverse of git-ls-tree.
2006-02-21  Junio C HamanoMerge branch 'lt/merge-tree'
2006-02-20  Junio C HamanoMerge branch 'jc/perl' into next
2006-02-20  Junio C HamanoMerge branch 'ra/anno' into next
2006-02-20  Ryan AndersonAdd git-annotate, a tool for assigning blame.
next