Merge branch 'jk/pack-corruption-post-mortem'
[git] / t / t3031-merge-criscross.sh
2015-04-14  Junio C HamanoMerge branch 'jk/pack-corruption-post-mortem'
2015-04-14  Junio C HamanoMerge branch 'jc/update-instead-into-void'
2015-04-14  Junio C HamanoMerge branch 'sb/plug-streaming-leak'
2015-04-14  Junio C HamanoMerge branch 'jn/doc-fast-import-no-16-octopus-limit'
2015-04-14  Junio C HamanoMerge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14  Junio C HamanoMerge branch 'pt/enter-repo-comment-fix'
2015-04-14  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix'
2015-04-14  Junio C HamanoMerge branch 'jk/cherry-pick-docfix'
2015-04-14  Junio C HamanoMerge branch 'iu/fix-parse-options-h-comment'
2015-04-14  Junio C HamanoMerge branch 'jg/cguide-we-cannot-count'
2015-04-02  Junio C HamanoMerge branch 'sb/atomic-push'
2015-03-31  Junio C HamanoSync with 2.3.5
2015-03-28  Junio C HamanoSync with maint
2015-03-28  Junio C HamanoMerge branch 'ph/push-doc-cas'
2015-03-28  Junio C HamanoMerge branch 'ss/pull-rebase-preserve'
2015-03-28  Junio C HamanoMerge branch 'jn/doc-api-errors'
2015-03-27  Junio C HamanoSync with maint
2015-03-27  Junio C HamanoMerge branch 'sb/leaks'
2015-03-27  Jiang XinMerge branch 'maint'
2015-03-27  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00...
2015-03-26  Junio C HamanoMerge branch 'jk/test-chain-lint'
2015-03-25  Jeff Kingt: fix some trivial cases of ignored exit codes in...
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-08-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo'
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-04-26  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10  David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02  Junio C HamanoMerge branch 'pt/gitk'
2012-03-24  Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2011-12-18  Junio C HamanoUpdate jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-14  Junio C HamanoMerge branch 'ml/mailmap' into maint-1.7.6
2011-12-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2011-11-23  Junio C HamanoMerge branch 'maint' into tj/imap-send-remove-unused
2011-11-21  Junio C HamanoMerge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18  Junio C HamanoMerge branch 'ml/mailmap' into maint
2011-11-10  Junio C HamanoMerge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-09  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref' into maint
2011-10-21  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref'
2011-10-21  Junio C HamanoMerge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-19  Junio C HamanoMerge branch 'cb/httpd-test-fix-port'
2011-10-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2011-10-14  Junio C HamanoMerge branch 'jc/apply-blank-at-eof-fix'
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16  Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint
2011-07-22  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd'
2011-07-19  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-07-06  Junio C HamanoMerge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-06-06  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-04-11  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-03  Junio C HamanoMerge branch 'jc/maint-rev-list-culled-boundary' into...
2011-03-26  Junio C HamanoMerge git-gui 0.14.0
2011-03-23  Junio C HamanoMerge branch 'jc/maint-rev-list-culled-boundary'
2010-12-14  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2010-09-18  Junio C HamanoMerge branch 'js/ls-files-x-doc'
2010-09-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2010-08-19  Junio C HamanoMerge branch 'tr/xsize-bits' into maint
2010-08-18  Junio C HamanoMerge branch 'tr/xsize-bits'
2010-08-02  Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21  Junio C HamanoMerge branch 'jn/gitweb-our-squelch'
2010-04-19  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11  Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10  Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-24  Junio C HamanoMerge branch 'jc/color-attrs' into maint
2010-03-20  Junio C HamanoMerge branch 'jc/color-attrs'
2010-03-08  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07  Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint-1.6.6
next