t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
[git] / t / t4013-diff-various.sh
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-28  Junio C HamanoMerge branch 'sb/rev-parse-show-superproject-root'
2017-10-28  Junio C HamanoMerge branch 'ao/path-use-xmalloc'
2017-10-28  Junio C HamanoMerge branch 'np/config-path-doc'
2017-10-26  Junio C HamanoMerge branch 'mh/ref-locking-fix'
2017-10-23  Junio C HamanoSync with 2.14.3
2017-10-23  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-19  Junio C HamanoMerge branch 'jc/branch-force-doc-readability-fix'
2017-10-19  Junio C HamanoMerge branch 'dg/filter-branch-filter-order-doc'
2017-10-19  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-19  Junio C HamanoMerge branch 'wk/merge-options-gpg-sign-doc'
2017-10-18  Junio C HamanoSync with maint
2017-10-18  Junio C HamanoMerge branch 'ma/pkt-line-leakfix' into maint
2017-10-18  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into maint
2017-10-18  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/ref-filter-colors-fix'
2017-10-18  Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17  Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17  Junio C HamanoMerge branch 'jc/doc-checkout'
2017-10-11  Junio C HamanoMerge branch 'ls/filter-process-delayed'
2017-10-11  Junio C HamanoMerge branch 'tb/complete-describe'
2017-10-11  Junio C HamanoMerge branch 'rs/rs-mailmap'
2017-10-11  Junio C HamanoMerge branch 'rs/fsck-null-return-from-lookup'
2017-10-11  Junio C HamanoMerge branch 'jk/sha1-loose-object-info-fix'
2017-10-11  Junio C HamanoMerge branch 'hn/string-list-doc'
2017-10-11  Junio C HamanoMerge branch 'tb/show-trailers-in-ref-filter'
2017-10-11  Junio C HamanoMerge branch 'jt/oidmap'
2017-10-11  Junio C HamanoMerge branch 'jr/hash-migration-plan-doc'
2017-10-09  Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-08  Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2017-10-07  Junio C HamanoMerge branch 'tb/ref-filter-empty-modifier'
2017-10-07  Junio C HamanoMerge branch 'ks/verify-filename-non-option-error-messa...
2017-10-07  Junio C HamanoMerge branch 'ks/branch-tweak-error-message-for-extra...
2017-10-07  Junio C HamanoMerge branch 'ma/builtin-unleak'
2017-10-07  Junio C HamanoMerge branch 'rb/compat-poll-fix'
2017-10-07  Junio C HamanoMerge branch 'tg/memfixes'
2017-10-07  Junio C HamanoMerge branch 'sb/branch-avoid-repeated-strbuf-release'
2017-10-07  Junio C HamanoMerge branch 'rs/qsort-s'
2017-10-07  Junio C HamanoMerge branch 'jn/strbuf-doc-re-reuse'
2017-10-07  Junio C HamanoMerge branch 'tb/delimit-pretty-trailers-args-with...
2017-10-05  Junio C HamanoMerge branch 'ar/request-pull-phrasofix'
2017-10-05  Junio C HamanoMerge branch 'rs/run-command-use-alloc-array'
2017-10-05  Junio C HamanoMerge branch 'sb/git-clang-format'
2017-10-05  Junio C HamanoMerge branch 'rs/use-free-and-null'
2017-10-05  Junio C HamanoMerge branch 'rs/tag-null-pointer-arith-fix'
2017-10-05  Junio C HamanoMerge branch 'rs/cocci-de-paren-call-params'
2017-10-05  Junio C HamanoMerge branch 'rs/cleanup-strbuf-users'
2017-10-05  Junio C HamanoMerge branch 'rs/resolve-ref-optional-result'
2017-10-05  Junio C HamanoMerge branch 'er/fast-import-dump-refs-on-checkpoint'
2017-10-04  Junio C HamanoMerge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03  Junio C HamanoMerge branch 'bw/git-clang-format'
2017-10-03  Junio C HamanoMerge branch 'ad/doc-markup-fix'
2017-10-03  Junio C HamanoMerge branch 'mh/mmap-packed-refs'
2017-10-03  Junio C HamanoMerge branch 'mr/doc-negative-pathspec'
2017-10-03  Junio C HamanoMerge branch 'sb/submodule-diff-header-fix'
2017-10-03  Junio C HamanoMerge branch 'sb/diff-color-move'
2017-09-28  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28  Junio C HamanoMerge branch 'jk/describe-omit-some-refs'
2017-09-28  Stefan Bellerdiff: correct newline in summary for renamed files
2017-09-25  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22  Junio C HamanoSync with 2.10.5
2017-09-20  Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-19  Junio C HamanoMerge branch 'ma/pkt-line-leakfix'
2017-09-10  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'sb/sha1-file-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10  Junio C HamanoMerge branch 'rj/add-chmod-error-message' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t3700-clean-leftover' into maint
2017-09-10  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t4062-obsd' into maint
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-23  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix' into...
2017-08-23  Junio C HamanoMerge branch 'sb/sha1-file-cleanup'
2017-08-23  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22  Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22  Junio C HamanoMerge branch 'rs/t3700-clean-leftover'
2017-08-22  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-11  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix'
2017-08-04  Junio C HamanoMerge branch 'ah/patch-id-doc'
2017-07-31  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30  Junio C HamanoMerge tag 'v2.10.4' into maint-2.11
2017-07-30  Junio C HamanoMerge tag 'v2.8.6' into maint-2.9
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-21  Junio C HamanoMerge branch 'ew/fd-cloexec-fix' into maint
2017-07-21  Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture' into maint
2017-07-20  Junio C HamanoMerge branch 'ew/fd-cloexec-fix'
2017-07-12  Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture'
2017-07-12  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-10  Junio C HamanoMerge branch 'jc/utf8-fprintf' into maint
2017-07-10  Junio C HamanoMerge branch 'js/fsck-name-object' into maint
next