sequencer: signal failed ff as an aborted, not a conflicted merge
[git] / cache-tree.c
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-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-09  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09  Junio C HamanoMerge commit 'doc/http-backend: missing accent grave...
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 'mr/msvc-link-with-invalidcontinue'
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-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-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 '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-28  Junio C HamanoMerge branch 'ys/fsck-commit-parsing'
2014-03-28  Junio C HamanoMerge branch 'bg/rebase-off-of-previous-branch'
2014-03-28  Junio C HamanoMerge branch 'bp/commit-p-editor'
2014-03-28  Junio C HamanoMerge branch 'ah/doc-gitk-config'
2014-03-28  Junio C HamanoMerge branch 'fr/add-interactive-argv-array'
2014-03-28  Junio C HamanoMerge branch 'jk/subtree-prefix'
2014-03-28  Junio C HamanoMerge branch 'jk/pack-bitmap-progress'
2014-03-28  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-03-25  Junio C HamanoMerge branch 'ss/test-on-mingw-rsync-path-no-absolute'
2014-03-25  Junio C HamanoMerge branch 'bb/diff-no-index-dotdot'
2014-03-25  Junio C HamanoMerge branch 'us/printf-not-echo'
2014-03-25  Junio C HamanoMerge branch 'rr/doc-merge-strategies'
2014-03-25  Junio C HamanoMerge branch 'nd/index-pack-error-message'
2014-03-25  Junio C HamanoMerge branch 'jk/lib-terminal-lazy'
2014-03-25  Junio C HamanoMerge branch 'dm/configure-iconv-locale-charset'
2014-03-25  Junio C HamanoMerge branch 'nd/commit-editor-cleanup'
2014-03-25  Junio C HamanoMerge branch 'jk/warn-on-object-refname-ambiguity'
2014-03-25  Junio C HamanoMerge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25  Junio C HamanoMerge branch 'nd/indent-fix-connect-c'
2014-03-25  Junio C HamanoMerge branch 'jk/mv-submodules-fix'
2014-03-25  Junio C HamanoMerge branch 'cp/am-patch-format-doc'
2014-03-21  Junio C HamanoMerge branch 'lt/request-pull'
2014-03-21  Junio C HamanoMerge branch 'es/sh-i18n-envsubst'
2014-03-21  Junio C HamanoMerge branch 'nd/upload-pack-shallow'
2014-03-21  Junio C HamanoMerge branch 'jn/wt-status'
2014-03-21  Junio C HamanoMerge branch 'jc/stash-pop-not-popped'
2014-03-21  Junio C HamanoMerge branch 'dk/skip-prefix-scan-only-once'
2014-03-21  Junio C HamanoMerge branch 'nd/tag-version-sort'
2014-03-21  Junio C HamanoMerge branch 'jk/shallow-update-fix'
2014-03-21  Junio C HamanoMerge branch 'tc/commit-dry-run-exit-status-tests'
2014-03-18  Junio C HamanoSync with 1.9.1
2014-03-18  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'rs/grep-h-c'
2014-03-18  Junio C HamanoMerge branch 'rm/strchrnul-not-strlen'
2014-03-18  Junio C HamanoMerge branch 'jc/tag-contains-with'
2014-03-18  Junio C HamanoMerge branch 'bg/install-branch-config-skip-prefix'
2014-03-18  Junio C HamanoMerge branch 'jc/no-need-for-env-in-sh-scripts'
2014-03-18  Junio C HamanoMerge branch 'sh/use-hashcpy'
2014-03-18  Junio C HamanoMerge branch 'mh/simplify-cache-tree-find'
2014-03-18  Junio C HamanoMerge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18  Junio C HamanoMerge branch 'jk/doc-deprecate-grafts'
2014-03-18  Junio C HamanoMerge branch 'jk/detect-push-typo-early'
2014-03-18  Junio C HamanoMerge branch 'jk/repack-pack-keep-objects'
2014-03-18  Junio C HamanoMerge branch 'sh/finish-tmp-packfile'
2014-03-18  Junio C HamanoMerge branch 'dd/use-alloc-grow'
2014-03-18  Junio C HamanoMerge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-03-10  Rohit Maniuse strchrnul() in place of strchr() and strlen()
next