xdl_merge(): fix and simplify conflict handling
[git] / commit.h
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-10-17  Junio C HamanoMerge branch 'maint'
2006-10-02  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-07  Junio C HamanoMerge branch 'jc/daemon'
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-31  Junio C HamanoMerge early part of branch 'jc/daemon'
2006-08-28  Jonas FonsecaAdd --relative-date option to the revision interface
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree'
2006-07-10  Junio C HamanoMerge branch 'jc/rename'
2006-07-10  Junio C HamanoMerge branch 'jc/grep'
2006-07-10  Junio C HamanoMerge branch 'jc/mailinfo'
2006-07-10  Junio C HamanoMerge branch 'ew/svn'
2006-07-07  Junio C HamanoMerge branch 'js/merge-base'
2006-07-03  Junio C HamanoMerge branch 'master' into js/merge-base
2006-07-02  Rene ScharfeFold get_merge_bases_clean() into get_merge_bases()
2006-07-02  Rene ScharfeAdd get_merge_bases_clean()
2006-06-29  Johannes Schindelinmove get_merge_bases() to core lib.
2006-06-22  Junio C HamanoMerge early parts of branch 'js/diff'
2006-06-19  Junio C HamanoMerge branch 'jc/shared'
2006-06-18  Junio C HamanoMerge branch 'eb/mail' into next
2006-06-18  Linus TorvaldsMove "void *util" from "struct object" into "struct...
2006-06-18  Junio C HamanoMerge branch 'jc/rw-prefix'
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04  Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next
2006-06-02  Junio C HamanoMerge branch 'nh/http'
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-01  Junio C HamanoMerge branch 'nh/http' into next
2006-05-29  Junio C HamanoMerge branch 'jc/cache-tree'
2006-05-29  Junio C HamanoMerge branch 'lt/tree' into jc/lt-tree-n-cache-tree
2006-05-28  Junio C HamanoMerge branch 'jc/cache-tree' into next
2006-05-28  Junio C HamanoMerge branch 'jc/mailinfo'
2006-05-28  Junio C HamanoMerge branch 'eb/mailinfo'
2006-05-26  Junio C HamanoMerge branch 'eb/mailinfo' into next
2006-05-24  Junio C HamanoMerge branch 'master' into sp/reflog
2006-05-24  Junio C HamanoMerge branch 'master' into lt/apply
2006-05-24  Junio C HamanoMerge branch 'be/tag'
2006-05-24  Junio C HamanoMerge branch 'js/fmt-patch'
2006-05-24  Junio C HamanoMerge branch 'master' into next
2006-05-23  Junio C HamanoMerge branch 'master' into next
2006-05-23  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-23  Junio C HamanoMerge branch 'eb/mailinfo' into next
2006-05-23  Junio C HamanoMerge branch 'be/tag' into next
2006-05-23  Junio C HamanoMerge branch 'jc/builtin-n-tar-tree' into next
2006-05-23  Junio C HamanoMerge branch 'jc/dirwalk-n-cache-tree' into next
2006-05-23  Junio C HamanoMerge branch 'master' into next
2006-05-23  Junio C HamanoMerge branch 'se/http' into next
2006-05-22  Junio C HamanoMerge branch 'jc/fetch-sorted' into next
2006-05-22  Junio C HamanoMerge branch 'master' into next
2006-05-22  Junio C HamanoMerge branch 'jc/mailinfo' into next
2006-05-21  Junio C HamanoMerge branch 'js/fmt-patch' into next
2006-05-21  Johannes Schindelinfmt-patch: Support --attach
2006-05-21  Junio C HamanoMerge branch 'master' into js/fmt-patch
2006-05-20  Junio C HamanoMerge branch 'jc/dirwalk-n-cache-tree' into next
2006-05-20  Junio C HamanoMerge branch 'jc/tartree' into next
2006-05-20  Junio C HamanoMerge branch 'master' into next
2006-05-20  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-19  Junio C HamanoMerge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-19  Junio C HamanoMerge branch 'eb/quilt' into next
2006-05-19  Junio C HamanoMerge branch 'ts/doctar' into next
2006-05-19  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18  Junio C HamanoMerge branch 'master' into next
2006-05-18  Junio C HamanoMerge branch 'maint'
2006-05-18  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-17  Junio C HamanoMerge branch 'jc/apply' into next
2006-05-17  Junio C HamanoMerge branch 'jc/read-tree-safety' into next
2006-05-17  Junio C HamanoMerge branch 'lt/grep' into next
2006-05-17  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-17  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-17  Junio C HamanoMerge branch 'jc/gitlink' into next
2006-05-17  Junio C HamanoMerge branch 'ew/pretty-fmt' into next
2006-05-17  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-17  Junio C HamanoMerge branch 'master' into next
2006-05-17  Junio C HamanoMerge branch 'maint'
2006-05-16  Junio C HamanoMerge branch 'np/pack' into next
2006-05-16  Junio C HamanoMerge branch 'jc/diff' into next
2006-05-16  Junio C HamanoMerge branch 'master' into next
2006-05-16  Junio C HamanoMerge branch 'jc/apply' into next
2006-05-15  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-15  Junio C HamanoMerge branch 'ew/send-email' into next
2006-05-15  Junio C HamanoMerge branch 'np/pack' into next
2006-05-15  Junio C HamanoMerge branch 'lt/oneway' into next
2006-05-15  Junio C HamanoMerge branch 'fix'
2006-05-15  Junio C HamanoMerge branch 'se/tag' into next
2006-05-15  Junio C HamanoMerge branch 'jc/grep' into next
next