sequencer: signal failed ff as an aborted, not a conflicted merge
[git] / Makefile
2014-05-30  Junio C HamanoSync with 1.9.4
2014-05-28  Junio C HamanoMerge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-28  Junio C HamanoMerge branch 'mw/symlinks' into maint
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-13  Junio C HamanoMerge branch 'fc/prompt-zsh-read-from-file'
2014-05-09  Junio C HamanoSync with 1.9.3
2014-05-08  Junio C HamanoSync with maint
2014-05-08  Junio C HamanoMerge branch 'cl/p4-use-diff-tree' into maint
2014-05-08  Junio C HamanoMerge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-08  Junio C HamanoMerge branch 'tb/unicode-6.3-zero-width' into maint
2014-05-08  Junio C HamanoMerge branch 'km/avoid-bs-in-shell-glob' into maint
2014-05-08  Junio C HamanoMerge branch 'km/avoid-cp-a' into 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-05-02  Junio C HamanoMerge branch 'mk/doc-git-gui-display-untracked'
2014-04-30  Junio C HamanoMerge git://github.com/git-l10n/git-po
2014-04-30  Junio C HamanoRevert the whole "ask curl-config" topic for now
2014-04-28  Junio C HamanoMerge branch 'db/make-with-curl'
2014-04-28  Junio C HamanoMerge branch 'jk/external-diff-use-argv-array' (early...
2014-04-28  Dave BorowitzMakefile: default to -lcurl when no CURL_CONFIG or...
2014-04-24  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-04-24  Junio C HamanoMerge branch 'fc/transport-helper-sync-error-fix'
2014-04-24  Junio C HamanoMerge branch 'db/make-with-curl'
2014-04-21  Junio C HamanoMerge git://bogomips.org/git-svn
2014-04-21  Junio C HamanoMerge branch 'jx/i18n'
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-17  Jiang Xini18n: only extract comments marked with "TRANSLATORS:"
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-15  Dave BorowitzMakefile: allow static linking against libcurl
2014-04-15  Dave BorowitzMakefile: use curl-config to determine curl flags
2014-04-09  Junio C HamanoSync with 1.9.2
2014-04-09  Junio C HamanoMerge branch 'jl/nor-or-nand-and' into maint
2014-04-09  Junio C HamanoMerge branch 'cn/fetch-prune-overlapping-destination...
2014-04-09  Junio C HamanoMerge branch 'mh/update-ref-batch-create-fix' into...
2014-04-09  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09  Junio C HamanoMerge branch 'jc/fix-diff-no-index-diff-opt-parse'...
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 'mm/status-porcelain-format-i18n-fix'...
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 'jk/mv-submodules-fix' into maint
2014-04-03  Junio C HamanoMerge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03  Junio C HamanoMerge branch 'jk/lib-terminal-lazy' into maint
2014-04-03  Junio C HamanoMerge branch 'nd/index-pack-error-message' into maint
2014-04-03  Junio C HamanoMerge branch 'rr/doc-merge-strategies' into maint
2014-04-03  Junio C HamanoMerge branch 'jc/stash-pop-not-popped' into 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-04-01  Jeff Kingdate: recognize bogus FreeBSD gmtime output
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 '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-31  Justin Lebarcomments: fix misuses of "nor"
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'
next