]> git.ipfire.org Git - thirdparty/git.git/history - xdiff/xdiff.h
Merge branch 'gp/maint-cvsserver'
[thirdparty/git.git] / xdiff / xdiff.h
2010-01-28  Junio C HamanoMerge branch 'gp/maint-cvsserver'
2010-01-27  Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27  Junio C HamanoMerge branch 'il/maint-colon-address'
2010-01-27  Junio C HamanoMerge branch 'il/maint-xmallocz'
2010-01-27  Junio C HamanoMerge branch 'jh/maint-config-file-prefix'
2010-01-25  Junio C HamanoMerge branch 'jc/fix-tree-walk'
2010-01-24  Junio C HamanoMerge branch 'maint'
2010-01-24  Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-24  Junio C HamanoMerge branch 'doc-style/for-next' of git://repo.or...
2010-01-23  Junio C HamanoMerge branch 'maint'
2010-01-23  Junio C HamanoMerge branch 'jc/branch-d'
2010-01-23  Junio C HamanoMerge branch 'il/rev-glob'
2010-01-23  Junio C HamanoMerge branch 'js/refer-upstream'
2010-01-23  Junio C HamanoMerge branch 'jl/submodule-diff'
2010-01-23  Junio C HamanoMerge branch 'il/remote-updates'
2010-01-23  Junio C HamanoMerge branch 'il/branch-set-upstream'
2010-01-23  Junio C HamanoMerge branch 'jc/maint-limit-note-output'
2010-01-23  Junio C HamanoMerge branch 'nd/ls-files-sparse-fix'
2010-01-22  Junio C HamanoMerge branch 'maint'
2010-01-21  Junio C HamanoMerge branch 'bw/cvsimport'
2010-01-21  Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-21  Junio C HamanoMerge branch 'ag/patch-header-verify'
2010-01-21  Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-01-21  Junio C HamanoMerge branch 'ag/maint-apply-too-large-p'
2010-01-21  Junio C HamanoMerge branch 'ap/merge-backend-opts'
2010-01-17  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-17  Junio C Hamanoxdl_merge(): allow passing down marker_size in xmparam_t
2010-01-17  Junio C Hamanoxdl_merge(): introduce xmparam_t for merge specific...
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-31  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-27  Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03  Junio C HamanoMerge branch 'jc/maint-am-keep' into maint
2009-11-30  Junio C HamanoMerge branch 'jc/maint-am-keep'
2009-11-30  Junio C Hamanogit-merge-file --ours, --theirs
2009-10-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-09-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16  Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-01  Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-21  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-16  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix'
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-07-02  Junio C HamanoMerge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-06-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-11  Junio C HamanoMerge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02  Junio C HamanoMerge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-05-26  Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26  Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-23  Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat'
2009-05-23  Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv'
2009-05-14  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-09  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-05-09  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06  Junio C HamanoMerge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-05-03  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-05-03  Junio C HamanoMerge branch 'lt/pack-object-memuse' into maint
2009-05-03  Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03  Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-29  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-25  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18  Junio C HamanoMerge branch 'lt/pack-object-memuse'
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-12  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-12  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09  Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09  Junio C HamanoMerge branch 'maint-1.6.1' into maint
next