sequencer: signal failed ff as an aborted, not a conflicted merge
[git] / t / t3506-cherry-pick-ff.sh
2013-09-18  Junio C HamanoMerge branch 'jc/cvsserver-perm-bit-fix'
2013-09-18  Junio C HamanoMerge branch 'bc/send-email-ssl-die-message-fix'
2013-09-18  Junio C HamanoMerge branch 'uh/git-svn-serf-fix'
2013-09-18  Junio C HamanoMerge branch 'fc/contrib-bzr-hg-fixes'
2013-09-18  Junio C HamanoMerge branch 'js/add-i-mingw'
2013-09-18  Junio C HamanoMerge branch 'ks/p4-view-spec'
2013-09-18  Junio C HamanoMerge branch 'jk/duplicate-objects-in-packs'
2013-09-18  Junio C HamanoMerge branch 'nd/git-dir-pointing-at-gitfile'
2013-09-18  Junio C HamanoMerge branch 'jk/pager-bypass-cat-for-default-pager'
2013-09-18  Junio C HamanoMerge branch 'fc/t3200-fixes'
2013-09-18  Junio C HamanoMerge branch 'fc/rev-parse-test-updates'
2013-09-17  Junio C HamanoMerge branch 'jk/remove-remote-helpers-in-python'
2013-09-17  Junio C HamanoMerge branch 'ss/doclinks'
2013-09-17  Junio C HamanoMerge branch 'rh/ishes-doc'
2013-09-17  Junio C HamanoMerge branch 'dw/diff-no-index-doc'
2013-09-17  Junio C HamanoMerge branch 'ta/user-manual'
2013-09-17  Junio C HamanoMerge branch 'fc/trivial'
2013-09-17  Junio C HamanoMerge branch 'fc/fast-export'
2013-09-17  Junio C HamanoMerge branch 'ab/gitweb-author-initials'
2013-09-17  Junio C HamanoMerge branch 'jk/has-sha1-file-retry-packed'
2013-09-17  Junio C HamanoMerge branch 'jk/write-broken-index-with-nul-sha1'
2013-09-17  Junio C HamanoMerge branch 'jx/clean-interactive'
2013-09-17  Junio C HamanoMerge branch 'tb/precompose-autodetect-fix'
2013-09-17  Junio C HamanoMerge branch 'kk/tests-with-no-perl'
2013-09-17  Junio C HamanoMerge branch 'ap/commit-author-mailmap'
2013-09-17  Junio C HamanoMerge branch 'jk/free-tree-buffer'
2013-09-17  Junio C HamanoMerge branch 'maint'
2013-09-12  Junio C HamanoSync with maint for l10n updates
2013-09-12  Junio C HamanoMerge branch 'jc/pager-configuration-doc'
2013-09-12  Junio C HamanoMerge branch 'mm/remote-helpers-doc'
2013-09-12  Junio C HamanoMerge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-12  Junio C HamanoMerge branch 'mm/fast-import-feature-doc'
2013-09-12  Junio C HamanoMerge branch 'mm/mediawiki-dumb-push-fix'
2013-09-12  Junio C HamanoMerge branch 'jc/commit-is-spelled-with-two-ems'
2013-09-11  Junio C HamanoMerge branch 'js/xread-in-full'
2013-09-05  Junio C Hamanotypofix: cherry is spelled with two ars
2013-08-05  Junio C HamanoMerge branch 'dn/test-reject-utf-16'
2013-07-31  Junio C HamanoMerge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31  Junio C HamanoMerge branch 'ds/doc-two-kinds-of-tags'
2013-07-30  Junio C HamanoMerge branch 'jk/capabilities-doc'
2013-07-22  Junio C HamanoMerge branch 'jk/t0008-sigpipe-fix'
2013-07-22  Junio C HamanoMerge branch 'sb/parse-object-buffer-eaten'
2013-07-22  Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half...
2013-07-19  Junio C HamanoMerge branch 'jc/t1512-fix' into maint
2013-07-15  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-12  Junio C HamanoMerge branch 'rs/pickaxe-simplify'
2013-07-12  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half'
2013-07-11  Junio C HamanoMerge branch 'jc/t1512-fix'
2013-07-11  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf'
2013-07-11  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow'
2013-07-03  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-06-27  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-26  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-11  Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index'
2013-06-02  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'
2013-05-29  Junio C HamanoMerge branch 'jk/lookup-object-prefer-latest'
2013-05-29  Junio C HamanoMerge branch 'as/check-ignore'
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-09  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-01  Junio C HamanoMerge branch 'hb/git-pm-tempfile'
2013-04-26  Junio C HamanoMerge branch 'ph/rebase-original'
2013-04-24  Junio C HamanoMerge branch 'sr/log-SG-no-textconv' into maint
2013-04-24  Junio C HamanoMerge branch 'jc/merge-tag-object' into maint
2013-04-22  Junio C HamanoMerge branch 'jc/detached-head-doc' into maint
2013-04-22  Junio C HamanoMerge branch 'jk/show-branch-strbuf' into maint
2013-04-22  Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL...
2013-04-22  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent' into maint
2013-04-22  Junio C HamanoMerge branch 'jk/suppress-clang-warning' into maint
2013-04-22  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original...
2013-04-19  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin'
2013-04-18  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple' (early...
2013-04-18  Junio C HamanoMerge branch 'jc/detached-head-doc'
2013-04-15  Junio C HamanoMerge branch 'jk/show-branch-strbuf'
2013-04-12  Junio C HamanoMerge branch 'jk/diffcore-break-divzero' into maint
2013-04-12  Junio C HamanoMerge branch 'cn/commit-amend-doc' into maint
2013-04-12  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-12  Junio C HamanoMerge branch 'sr/log-SG-no-textconv'
2013-04-12  Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL'
2013-04-07  Junio C HamanoMerge branch 'cn/commit-amend-doc'
2013-04-07  Junio C HamanoMerge branch 'jk/diffcore-break-divzero'
2013-04-07  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned'
2013-04-07  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original'
2013-04-07  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix' into...
2013-04-05  Junio C HamanoMerge branch 'jl/submodule-deinit'
2013-04-05  Junio C HamanoMerge branch 'jc/merge-tag-object'
2013-04-04  Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04  Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04  Junio C HamanoMerge branch 'jk/peel-ref' into maint
2013-04-03  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent'
2013-04-03  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix'
2013-04-03  Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time' into maint
next