Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1
[git] / git-mergetool.sh
2013-04-03  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-update-index-h-is-for-help'...
2013-04-03  Junio C HamanoMerge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-03-25  Junio C HamanoMerge branch 'lf/bundle-verify-list-prereqs' into maint...
2013-03-25  Junio C HamanoMerge branch 'tk/doc-filter-branch' into maint-1.8.1
2013-03-25  Junio C HamanoMerge branch 'dm/ni-maxhost-may-be-missing' into maint...
2013-03-25  Junio C HamanoMerge branch 'gp/describe-match-uses-glob-pattern'...
2013-03-25  Junio C HamanoMerge branch 'nd/doc-index-format' into maint-1.8.1
2013-03-25  Junio C HamanoMerge branch 'wk/doc-pre-rebase' into maint-1.8.1
2013-03-25  Junio C HamanoMerge branch 'jc/color-diff-doc' into maint-1.8.1
2013-03-07  Junio C HamanoMerge branch 'mh/maint-ceil-absolute' into maint
2013-03-01  Junio C HamanoMerge branch 'wk/user-manual' into maint
2013-02-27  Junio C HamanoMerge branch 'ef/non-ascii-parse-options-error-diag...
2013-02-27  Junio C HamanoMerge branch 'wk/man-deny-current-branch-is-default...
2013-02-27  Junio C HamanoMerge branch 'jn/less-reconfigure' into maint
2013-02-25  Junio C HamanoMerge branch 'jc/mention-tracking-for-pull-default...
2013-02-25  Junio C HamanoMerge branch 'mm/config-intro-in-git-doc' into maint
2013-02-25  Junio C HamanoMerge branch 'da/p4merge-mktemp-fix' into maint
2013-02-25  Junio C HamanoMerge branch 'bw/get-tz-offset-perl' into maint
2013-02-25  Junio C HamanoMerge branch 'al/mergetool-printf-fix' into maint
2013-02-20  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-02-08  Asheesh Laroiagit-mergetool: print filename when it contains %
2013-02-07  Junio C HamanoMerge branch 'ft/transport-report-segv' into maint
2013-02-07  Junio C HamanoMerge branch 'sb/gpg-plug-fd-leak' into maint
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-29  Junio C HamanoMerge branch 'ph/rebase-preserve-all-merges' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14  Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar...
2013-01-14  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-14  Junio C HamanoMerge branch 'mk/maint-graph-infinity-loop' into maint
2013-01-12  Junio C HamanoMerge branch 'as/api-allocation-doc' into maint
2013-01-12  Junio C HamanoMerge branch 'os/gitweb-highlight-uncaptured' into...
2013-01-12  Junio C HamanoMerge branch 'jn/warn-on-inaccessible-loosen' into...
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10  Junio C HamanoMerge branch 'tb/test-t9020-no-which' into maint
2012-12-23  Junio C HamanoMerge branch 'nd/index-format-doc' into maint
2012-12-21  Junio C HamanoMerge branch 'nd/index-format-doc'
2012-11-29  Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-26  Junio C HamanoMerge branch 'cn/config-missing-path' into maint
2012-11-21  Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20  Junio C HamanoMerge branch 'cn/config-missing-path'
2012-11-20  Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-20  Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20  Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite' into...
2012-11-20  Junio C HamanoMerge branch 'rs/lock-correct-ref-during-delete' into...
2012-11-19  Junio C HamanoMerge branch 'jc/test-say-color-avoid-echo-escape'...
2012-11-15  Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite'
2012-11-15  Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09  Jeff KingMerge branch 'nd/tree-walk-enum-cleanup'
2012-11-09  Jeff KingMerge branch 'rs/lock-correct-ref-during-delete'
2012-10-29  Jeff KingMerge branch 'jk/maint-http-init-not-in-result-handler'
2012-10-29  Jeff KingMerge branch 'jl/submodule-rm'
2012-10-25  Jeff KingMerge branch 'jk/strbuf-detach-always-non-null'
2012-10-25  Jeff KingMerge branch 'jc/test-say-color-avoid-echo-escape'
2012-10-25  Jeff KingMerge branch 'fa/remote-svn'
2012-10-25  Jeff KingMerge branch 'jk/no-more-pre-exec-callback'
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17  Junio C HamanoMerge branch 'nd/doc-ignore' into maint
2012-10-17  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17  Junio C HamanoMerge branch 'rr/test-use-shell-path-not-shell' into...
2012-10-17  Junio C HamanoMerge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push'
2012-10-10  Junio C HamanoMerge branch 'nd/doc-ignore'
2012-10-08  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08  Junio C HamanoMerge branch 'jc/merge-bases-paint-fix'
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-08  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-05  Junio C HamanoMerge commit 'f9f6e2c' into nd/attr-match-optim-more
2012-10-03  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-01  Junio C HamanoMerge branch 'da/mergetool-custom'
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-09-30  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match-1' into maint
2012-09-30  Junio C HamanoMerge branch 'jc/maint-mailinfo-mime-attr' into maint
2012-09-30  Junio C HamanoMerge branch 'rs/archive-zip-utf8'
2012-09-30  Junio C HamanoMerge branch 'rr/test-use-shell-path-not-shell'
2012-09-27  Jiang XinMerge branch 'l10n-thynson' of git://github.com/thynson...
2012-09-27  Jiang XinMerge branch 'maint' of https://github.com/ralfth/git...
2012-09-25  Junio C HamanoMerge branch 'aj/xfuncname-ada'
2012-09-25  Junio C HamanoMerge branch 'jc/maint-mailinfo-mime-attr'
2012-09-24  Junio C HamanoMerge branch 'jc/maint-blame-no-such-path' into maint
2012-09-24  Junio C HamanoMerge branch 'dj/fetch-all-tags' into maint
2012-09-21  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match-1'
2012-09-20  Junio C HamanoMerge branch 'nd/maint-diffstat-summary' into maint
2012-09-20  Junio C HamanoMerge branch 'dg/run-command-child-cleanup' into maint
2012-09-20  Junio C HamanoMerge branch 'jc/mailinfo-RE' into maint
2012-09-20  Junio C HamanoMerge branch 'sn/ls-remote-get-url-doc' into maint
2012-09-20  Junio C HamanoMerge branch 'nd/log-n-doc' into maint
2012-09-20  Junio C HamanoMerge branch 'nd/maint-remote-remove' into maint
2012-09-18  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match'
2012-09-18  Junio C HamanoMerge branch 'pw/p4-submit-conflicts'
2012-09-18  Junio C HamanoMerge branch 'nd/fetch-status-alignment'
2012-09-18  Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint
2012-09-18  Junio C HamanoMerge branch 'jk/config-warn-on-inaccessible-paths...
2012-09-17  Junio C HamanoMerge branch 'nd/maint-diffstat-summary'
next