sequencer: signal failed ff as an aborted, not a conflicted merge
[git] / t / t1302-repo-version.sh
2014-05-30  Junio C HamanoSync with 1.9.4
2014-05-19  Junio C HamanoMerge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-05-19  Junio C HamanoMerge branch 'lt/request-pull'
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-19  Junio C HamanoMerge branch 'kb/fast-hashmap'
2014-05-09  Junio C HamanoSync with 1.9.3
2014-05-08  Junio C HamanoSync with maint
2014-05-07  Junio C HamanoMerge branch 'cl/p4-use-diff-tree'
2014-05-02  Junio C HamanoMerge branch 'mw/symlinks'
2014-05-02  Junio C HamanoMerge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-04-28  Junio C HamanoMerge branch 'jk/external-diff-use-argv-array' (early...
2014-04-24  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-04-21  Junio C HamanoMerge branch 'km/avoid-non-function-return-in-rebase'
2014-04-21  Junio C HamanoMerge branch 'ep/shell-command-substitution'
2014-04-18  Junio C HamanoMerge branch 'jk/config-die-bad-number-noreturn'
2014-04-18  Junio C HamanoMerge branch 'fc/remote-helper-fixes'
2014-04-16  Junio C HamanoMerge branch 'mh/multimail'
2014-04-16  Junio C HamanoMerge branch 'tb/unicode-6.3-zero-width'
2014-04-16  Junio C HamanoMerge branch 'km/avoid-cp-a'
2014-04-16  Junio C HamanoMerge branch 'km/avoid-bs-in-shell-glob'
2014-04-09  Junio C HamanoSync with 1.9.2
2014-04-08  Junio C HamanoMerge branch 'maint'
2014-04-08  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-04-08  Junio C HamanoMerge branch 'jl/nor-or-nand-and'
2014-04-08  Junio C HamanoMerge branch 'mh/update-ref-batch-create-fix'
2014-04-08  Junio C HamanoMerge branch 'mr/opt-set-ptr'
2014-04-08  Junio C HamanoMerge branch 'ib/rev-parse-parseopt-argh'
2014-04-08  Junio C HamanoMerge branch 'mr/msvc-link-with-invalidcontinue'
2014-04-08  Junio C HamanoMerge branch 'jc/rev-parse-argh-dashed-multi-words'
2014-04-08  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
2014-04-03  Junio C HamanoMerge branch 'maint'
2014-04-03  Junio C HamanoMerge branch 'nd/gc-aggressive'
2014-04-03  Junio C HamanoMerge branch 'jc/fix-diff-no-index-diff-opt-parse'
2014-04-03  Junio C HamanoMerge branch 'cb/aix'
2014-04-03  Junio C HamanoMerge branch 'cn/fetch-prune-overlapping-destination'
2014-04-03  Junio C HamanoMerge branch 'nd/log-show-linear-break'
2014-04-03  Junio C HamanoMerge branch 'ep/shell-command-substitution'
2014-04-02  Junio C HamanoMerge branch 'ap/remote-hg-skip-null-bookmarks'
2014-04-02  Junio C HamanoMerge branch 'rs/pickaxe-i'
2014-03-31  Junio C HamanoMerge branch 'mm/status-porcelain-format-i18n-fix'
2014-03-31  Junio C HamanoMerge branch 'an/branch-config-message'
2014-03-31  Junio C HamanoMerge branch 'jk/tests-cleanup'
2014-03-21  Jeff Kingt: prefer "git config --file" to GIT_CONFIG
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'
2012-02-16  Junio C HamanoMerge branch 'mm/empty-loose-error-message' into maint
2012-02-13  Junio C HamanoMerge branch 'mm/empty-loose-error-message'
next