sequencer: signal failed ff as an aborted, not a conflicted merge
[git] / t / t5305-include-tag.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 'wt/doc-submodule-name-path-confusion-2'
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31  Junio C HamanoMerge branch 'mr/msvc-link-with-lcurl'
2014-03-31  Junio C HamanoMerge branch 'ib/rev-parse-parseopt-argh'
2014-03-31  Junio C HamanoMerge branch 'dp/makefile-charset-lib-doc'
2014-03-31  Junio C HamanoMerge branch 'js/userdiff-cc'
2014-03-31  Junio C HamanoMerge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-31  Junio C HamanoMerge branch 'ca/doc-config-third-party'
2014-03-31  Junio C HamanoMerge branch 'hs/simplify-bit-setting-in-fsck-tree'
2014-03-31  Junio C HamanoMerge branch 'dt/tests-with-env-not-subshell'
2014-03-19  David Trantests: use "env" to run commands with temporary env...
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
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/date-c-double-semicolon'
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-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
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-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo'
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-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...
2011-12-18  Junio C HamanoUpdate jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2011-11-23  Junio C HamanoMerge branch 'maint' into tj/imap-send-remove-unused
2011-11-10  Junio C HamanoMerge 'build-in git-mktree'
2011-11-09  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref' into maint
2011-10-21  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref'
2011-10-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-07-22  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd'
2011-07-06  Junio C HamanoMerge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-07-06  Junio C HamanoMerge commit 'v1.6.0' into jc/checkout-reflog-fix
2011-04-11  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2011-03-26  Junio C HamanoMerge git-gui 0.14.0
2010-12-14  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2010-09-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2010-08-19  Junio C HamanoMerge branch 'tr/xsize-bits' into maint
2010-08-18  Junio C HamanoMerge branch 'tr/xsize-bits'
2010-08-02  Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21  Junio C HamanoMerge branch 'jn/gitweb-our-squelch'
2010-04-19  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
next