Merge branch 'jl/submodule-ignore-diff'
[git] / git-mergetool.sh
2010-09-04  Junio C HamanoMerge branch 'jl/submodule-ignore-diff'
2010-09-04  Junio C HamanoMerge branch 'ab/test-2'
2010-09-04  Junio C HamanoMerge branch 'js/detached-stash'
2010-09-04  Junio C HamanoMerge branch 'js/maint-reflog-beyond-horizon'
2010-09-04  Junio C HamanoMerge branch 'dg/local-mod-error-messages'
2010-09-04  Junio C HamanoMerge branch 'nd/maint-fix-replace'
2010-09-03  Junio C HamanoMerge branch 'ab/compat-regex'
2010-09-03  Junio C HamanoMerge branch 'nd/clone-depth-zero'
2010-09-03  Junio C HamanoMerge branch 'jn/maint-doc-user-manual-html-doctype'
2010-09-03  Junio C HamanoMerge branch 'cb/maint-mergetool-no-tty'
2010-09-03  Junio C HamanoMerge branch 'jn/apply-filename-with-sp'
2010-09-03  Junio C HamanoMerge branch 'jn/merge-custom-no-trivial'
2010-09-03  Junio C HamanoMerge branch 'jc/maint-doc-em-dash'
2010-09-03  Junio C HamanoMerge branch 'jn/update-contrib-example-merge'
2010-09-03  Junio C HamanoMerge branch 'jn/merge-renormalize'
2010-09-03  Junio C HamanoSync with 1.7.2.3
2010-09-01  Junio C HamanoMerge branch 'maint'
2010-08-31  Junio C HamanoMerge branch 'np/maint-huge-delta-generation'
2010-08-31  Junio C HamanoMerge branch 'da/fix-submodule-sync-superproject-config'
2010-08-31  Junio C HamanoMerge branch 'jn/cherry-revert-message-clean-up'
2010-08-31  Junio C HamanoMerge branch 'cb/binary-patch-id'
2010-08-31  Junio C HamanoMerge branch 'ab/maint-reset-mixed-w-pathspec-advice'
2010-08-31  Junio C HamanoMerge branch 'dj/fetch-tagopt'
2010-08-31  Junio C HamanoMerge branch 'en/d-f-conflict-fix'
2010-08-31  Junio C HamanoMerge branch 'jn/svn-fe'
2010-08-31  Junio C HamanoMerge branch 'tr/maint-no-unquote-plus'
2010-08-31  Junio C HamanoMerge branch 'jn/paginate-fix'
2010-08-31  Junio C HamanoMerge branch 'jn/maint-setup-fix'
2010-08-31  Junio C HamanoMerge branch 'en/fast-export-fix'
2010-08-31  Junio C HamanoMerge branch 'hv/autosquash-config'
2010-08-31  Junio C HamanoMerge branch 'sg/rerere-gc-old-still-used'
2010-08-30  Junio C HamanoMerge branch 'maint'
2010-08-26  Junio C HamanoMerge branch 'maint'
2010-08-24  Junio C HamanoMerge branch 'maint'
2010-08-23  Junio C HamanoMerge branch 'maint'
2010-08-22  Junio C HamanoMerge branch 'mm/rebase-i-exec'
2010-08-22  Junio C HamanoMerge branch 'gb/split-cmdline-errmsg'
2010-08-22  Junio C HamanoMerge branch 'so/http-user-agent'
2010-08-22  Junio C HamanoMerge branch 'mm/shortopt-detached'
2010-08-22  Junio C HamanoMerge branch 'sr/local-config'
2010-08-22  Junio C HamanoMerge branch 'nd/fix-sparse-checkout'
2010-08-22  Junio C HamanoMerge branch 'hv/submodule-find-ff-merge'
2010-08-22  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix'
2010-08-22  Junio C HamanoMerge branch 'dg/local-mod-error-messages'
2010-08-22  Junio C HamanoMerge branch 'po/userdiff-csharp'
2010-08-22  Junio C HamanoMerge branch 'ab/perl-install'
2010-08-22  Junio C HamanoMerge branch 'maint'
2010-08-20  Charles Baileymergetool: Remove explicit references to /dev/tty
2010-08-20  Junio C HamanoMerge branch 'maint'
2010-08-19  Junio C HamanoMerge branch 'maint' to sync with 1.7.2.2
2010-08-19  Junio C HamanoMerge branch 'tr/xsize-bits' into maint
2010-08-18  Junio C HamanoMerge branch 'jc/maint-follow-rename-fix'
2010-08-18  Junio C HamanoMerge branch 'tf/string-list-init'
2010-08-18  Junio C HamanoMerge branch 'cc/find-commit-subject'
2010-08-18  Junio C HamanoMerge branch 'jn/maint-plug-leak'
2010-08-18  Junio C HamanoMerge branch 'jl/submodule-ignore-diff'
2010-08-18  Junio C HamanoMerge branch 'ml/rebase-x-strategy'
2010-08-18  Junio C HamanoMerge branch 'jn/fix-abbrev'
2010-08-18  Junio C HamanoMerge branch 'vs/doc-spell'
2010-08-18  Junio C HamanoMerge branch 'jh/use-test-must-fail'
2010-08-18  Junio C HamanoMerge branch 'jh/clean-exclude'
2010-08-18  Junio C HamanoMerge branch 'kf/post-receive-sample-hook'
2010-08-18  Junio C HamanoMerge branch 'ab/report-corrupt-object-with-type'
2010-08-18  Junio C HamanoMerge branch 'jn/rebase-rename-am'
2010-08-18  Junio C HamanoMerge branch 'jn/fast-import-subtree'
2010-08-18  Junio C HamanoMerge branch 'ar/string-list-foreach'
2010-08-18  Junio C HamanoMerge branch 'jh/graph-next-line'
2010-08-18  Junio C HamanoMerge branch 'tr/xsize-bits'
2010-08-18  Junio C HamanoMerge branch 'tc/checkout-B'
2010-08-17  David Aguilarmergetool: Skip autoresolved paths
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 'tr/maint-cherry-pick-list' into maint...
2010-03-07  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat'
2010-03-07  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list'
2010-03-02  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-10  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-08  Junio C HamanoMerge branch 'jc/maint-imap-config-parse' into maint
2010-02-08  Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07  Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31  Junio C HamanoMerge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24  Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-19  Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3
2010-01-17  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-12-31  Junio C HamanoMerge branch 'maint-1.6.0' into maint
next