Merge branch 'js/format-2047'
[git] / mergetools / defaults
2012-11-09  Jeff KingMerge branch 'js/format-2047'
2012-11-09  Jeff KingMerge branch 'rs/lock-correct-ref-during-delete'
2012-11-09  Jeff KingMerge branch 'nd/attr-match-optim-more'
2012-11-09  Jeff KingMerge branch 'mh/maint-parse-dirstat-fix'
2012-11-04  Jeff KingMerge branch 'tj/maint-doc-commit-sign'
2012-11-04  Jeff KingMerge branch 'pp/maint-doc-pager-config'
2012-11-04  Jeff KingMerge branch 'km/maint-doc-git-reset'
2012-11-04  Jeff KingMerge branch 'tb/maint-t9200-case-insensitive'
2012-11-04  Jeff KingMerge branch 'rf/maint-mailmap-off-by-one'
2012-11-04  Jeff KingMerge branch 'gb/maint-doc-svn-log-window-size'
2012-11-04  Jeff KingMerge branch 'sz/maint-submodule-reference-arg'
2012-11-04  Jeff KingMerge branch 'sl/maint-configure-messages'
2012-11-04  Jeff KingMerge branch 'po/maint-refs-replace-docs'
2012-11-04  Jeff KingMerge branch 'mm/maint-doc-remote-tracking'
2012-10-29  Jeff KingMerge branch 'nd/grep-true-path'
2012-10-29  Jeff KingMerge branch 'jk/maint-http-init-not-in-result-handler'
2012-10-29  Jeff KingMerge branch 'jl/submodule-add-by-name'
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 'js/mingw-fflush-errno'
2012-10-25  Jeff KingMerge branch 'da/mergetools-p4'
2012-10-25  Jeff KingMerge branch 'jc/test-say-color-avoid-echo-escape'
2012-10-25  Jeff KingMerge branch 'nd/attr-match-optim'
2012-10-25  Jeff KingMerge branch 'jk/peel-ref'
2012-10-25  Jeff KingMerge branch 'bw/config-lift-variable-name-length-limit'
2012-10-25  Jeff KingMerge branch 'fa/remote-svn'
2012-10-25  Jeff KingMerge branch 'jm/diff-context-config'
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 HamanoSync with 1.7.12.4
2012-10-16  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push'
2012-10-16  Jiang XinMerge branch 'master' of git://github.com/vnwildman/git
2012-10-14  Junio C HamanoMerge branch 'maint'
2012-10-12  Junio C HamanoMerge branch 'maint'
2012-10-10  Junio C HamanoMerge branch 'rr/git-uri-doc'
2012-10-10  Junio C HamanoMerge branch 'bw/cp-a-is-gnuism'
2012-10-10  Junio C HamanoMerge branch 'nd/doc-ignore'
2012-10-10  Junio C HamanoMerge branch 'jc/doc-long-options'
2012-10-10  Junio C HamanoSync with maint
2012-10-09  Junio C HamanoMerge branch 'maint'
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 HamanoSync with 1.7.12.3
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-03  Junio C HamanoMerge branch 'nd/grep-reflog'
2012-10-03  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-03  Junio C HamanoMerge branch 'tu/gc-auto-quiet'
2012-10-02  Junio C HamanoMerge branch 'maint'
2012-10-01  Junio C HamanoMerge branch 'jk/completion-tests'
2012-10-01  Junio C HamanoMerge branch 'ep/malloc-check-perturb'
2012-10-01  Junio C HamanoMerge branch 'da/mergetool-custom'
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-09-25  David Aguilarmergetool--lib: Allow custom commands to override built-ins
2012-09-18  Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint
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-09-11  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-09-11  Junio C HamanoMerge branch 'nd/index-errno' into maint-1.7.11
2012-09-11  Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable...
2012-08-27  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh'
2012-08-24  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-22  Junio C HamanoMerge branch 'nd/index-errno'
2012-08-22  Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable'
2012-08-06  Junio C HamanoMerge branch 'jn/block-sha1' into maint
2012-08-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-08-06  Junio C HamanoMerge branch 'lm/git-blame-el' into maint
2012-08-06  Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc' into maint
2012-08-06  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix' into...
2012-07-28  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix'
2012-07-24  Junio C HamanoMerge branch 'jn/block-sha1'
2012-07-22  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into maint
2012-07-22  Junio C HamanoMerge branch 'jc/refactor-diff-stdin' into maint
2012-07-22  Junio C HamanoMerge branch 'cw/no-detaching-an-unborn' into maint
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo'
2012-07-16  Junio C HamanoMerge branch 'tg/maint-cache-name-compare'
2012-07-16  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-13  Junio C HamanoMerge branch 'jc/refactor-diff-stdin'
2012-07-11  Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev' into maint
2012-07-11  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg...
2012-07-09  Junio C HamanoMerge branch 'cw/no-detaching-an-unborn'
2012-07-09  Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev'
2012-07-05  Junio C HamanoMerge branch 'hv/remote-end-hung-up'
2012-06-25  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch'
2012-06-25  Junio C HamanoMerge branch 'lm/git-blame-el'
2012-06-25  Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc'
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-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint
2012-06-01  Junio C HamanoMerge branch 'ef/maint-rebase-error-message'
2012-06-01  Junio C HamanoMerge branch 'rs/maint-grep-F' into maint
2012-05-25  Junio C HamanoMerge branch 'rs/maint-grep-F'
2012-05-23  Junio C HamanoMerge branch 'js/rev-parse-doc-fix'
2012-05-23  Junio C HamanoMerge branch 'js/rebase-i-p-test-fix'
2012-05-14  Junio C HamanoMerge branch 'ef/checkout-empty' into maint
2012-05-14  Junio C HamanoMerge branch 'jk/maint-tformat-with-z' into maint
2012-05-11  Junio C HamanoMerge branch 'ef/checkout-empty'
2012-05-11  Junio C HamanoMerge branch 'ah/maint-grep-double-init' into maint
2012-05-11  Junio C HamanoMerge branch 'fa/maint-config-doc' into maint
next