Sync with 2.1.2
[git] / t / t6038-merge-text-auto.sh
2014-09-30  Junio C HamanoSync with 2.1.2
2014-09-30  Junio C HamanoMerge branch 'jt/itimer-autoconf'
2014-09-30  Junio C HamanoMerge branch 'jc/test-lazy-prereq'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-30  Junio C HamanoMerge branch 'pr/use-default-sigpipe-setting'
2014-09-29  Junio C HamanoMerge branch 'jk/mbox-from-line'
2014-09-29  Junio C HamanoMerge branch 'sb/t6031-typofix'
2014-09-29  Junio C HamanoMerge branch 'sb/t9300-typofix'
2014-09-29  Junio C HamanoMerge branch 'da/rev-parse-verify-quiet'
2014-09-29  Junio C HamanoMerge branch 'hj/pretty-naked-decoration'
2014-09-28  Junio C HamanoMerge branch 'maint'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-09-26  Junio C HamanoMerge branch 'jk/branch-verbose-merged'
2014-09-26  Junio C HamanoMerge branch 'rs/realloc-array'
2014-09-26  Junio C HamanoMerge branch 'jk/close-stderr-of-credential-cache-deamon'
2014-09-26  Junio C HamanoMerge branch 'jc/ignore-sigpipe-while-running-hooks'
2014-09-26  Junio C HamanoMerge branch 'jk/prune-packed-server-info'
2014-09-26  Junio C HamanoMerge branch 'jc/hash-object-fsck-tag'
2014-09-26  Junio C HamanoMerge branch 'jc/hash-object'
2014-09-26  Junio C HamanoMerge branch 'js/fsck-tag-validation'
2014-09-26  Junio C HamanoMerge branch 'jk/faster-name-conflicts'
2014-09-26  Junio C HamanoMerge branch 'jk/write-packed-refs-via-stdio'
2014-09-19  Junio C HamanoSync with Git 2.1.1
2014-09-19  Junio C HamanoMerge branch 'jk/fsck-exit-code-fix'
2014-09-19  Junio C HamanoMerge branch 'so/rebase-doc'
2014-09-19  Junio C HamanoMerge branch 'ir/makefile-typofix'
2014-09-19  Junio C HamanoMerge branch 'wk/pre-push-sample-hook'
2014-09-19  Junio C HamanoMerge branch 'ss/compat-default-source-for-newer-gnu'
2014-09-19  Junio C HamanoMerge branch 'mr/mark-i18n-log-rerere'
2014-09-19  Junio C HamanoMerge branch 'js/no-test-cmp-for-binaries'
2014-09-19  Junio C HamanoMerge branch 'ta/config-add-to-empty-or-true-fix'
2014-09-19  Junio C HamanoMerge branch 'sp/doc-update-index-cacheinfo'
2014-09-19  Junio C HamanoMerge branch 'rs/export-strbuf-addchars'
2014-09-19  Junio C HamanoMerge branch 'kb/perf-trace'
2014-09-19  Junio C HamanoMerge branch 'jc/parseopt-verify-short-name'
2014-09-19  Junio C HamanoMerge branch 'mk/reachable-protect-detached-head'
2014-09-19  Junio C HamanoMerge branch 'tb/complete-diff-ignore-blank-lines'
2014-09-19  Junio C HamanoMerge branch 'as/calloc-takes-nmemb-then-size'
2014-09-19  Junio C HamanoMerge branch 'tb/crlf-tests'
2014-09-02  Brice LambsonMinGW: update tests to handle a native eol of crlf
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
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
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-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
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-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
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-24  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
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-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 '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-11  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg...
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-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-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-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...
2012-03-16  Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-03-12  Junio C HamanoMerge branch 'jc/maint-diff-patch-header' into maint
2012-03-06  Junio C HamanoMerge branch 'jc/maint-diff-patch-header'
2012-02-27  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
next