summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren
2021-07-22pull: since --ff-only overrides, handle it firstElijah Newren
2021-07-21pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie
2021-07-21t7601: add tests of interactions with multiple merge heads and configElijah Newren
2021-07-21t7601: test interaction of merge/rebase/fast-forward flags and optionsElijah Newren
2021-07-13The fourth batchJunio C Hamano
2021-07-13Merge branch 'rs/grep-parser-fix'Junio C Hamano
2021-07-13Merge branch 'bk/doc-commit-typofix'Junio C Hamano
2021-07-13Merge branch 'dc/p4-binary-submit-fix'Junio C Hamano
2021-07-13Merge branch 'ab/pre-auto-gc-hook-test'Junio C Hamano
2021-07-13Merge branch 'jk/union-merge-binary'Junio C Hamano
2021-07-13Merge branch 'mr/cmake'Junio C Hamano
2021-07-13Merge branch 'ab/describe-tests-fix'Junio C Hamano
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano
2021-07-13Merge branch 'hn/prep-tests-for-reftable'Junio C Hamano
2021-07-13Merge branch 'fc/push-simple-updates-cleanup'Junio C Hamano
2021-07-13Merge branch 'fc/push-simple-updates'Junio C Hamano
2021-07-13Merge branch 'zh/cat-file-batch-fix'Junio C Hamano
2021-07-08The third batchJunio C Hamano
2021-07-08Merge branch 'js/stop-exporting-bogus-columns'Junio C Hamano
2021-07-08Merge branch 'dd/document-log-decorate-default'Junio C Hamano
2021-07-08Merge branch 'ar/test-code-cleanup'Junio C Hamano
2021-07-08Merge branch 'ba/object-info'Junio C Hamano
2021-07-08Merge branch 'ab/progress-cleanup'Junio C Hamano
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Junio C Hamano
2021-07-08Merge branch 'ms/mergetools-kdiff3-on-windows'Junio C Hamano
2021-07-08Merge branch 'ab/cmd-foo-should-return'Junio C Hamano
2021-07-08Merge branch 'ar/doc-libera-chat-in-my-first-contrib'Junio C Hamano
2021-07-08Merge branch 'ar/mailinfo-memcmp-to-skip-prefix'Junio C Hamano
2021-07-08Merge branch 'jk/doc-max-pack-size'Junio C Hamano
2021-07-08Merge branch 'ab/fix-columns-to-80-during-tests'Junio C Hamano
2021-07-08Merge branch 'ar/more-typofix'Junio C Hamano
2021-07-08Merge branch 'fw/complete-cmd-idx-fix'Junio C Hamano
2021-07-08Merge branch 'jk/test-without-readlink-1'Junio C Hamano
2021-07-08Merge branch 'jx/sideband-cleanup'Junio C Hamano
2021-07-08Merge branch 'jk/test-avoid-globmatch-with-skip-patterns'Junio C Hamano
2021-07-08Merge branch 'jv/userdiff-csharp-update'Junio C Hamano
2021-07-08Merge branch 'ab/config-hooks-path-testfix'Junio C Hamano
2021-07-08Merge branch 'fc/pull-cleanups'Junio C Hamano
2021-07-08Merge branch 'jk/bitmap-tree-optim'Junio C Hamano
2021-07-08Merge branch 'ah/graph-typofix'Junio C Hamano
2021-07-08Merge branch 'jx/t6020-with-older-bash'Junio C Hamano
2021-07-08Merge branch 'ar/typofix'Junio C Hamano
2021-07-08Merge branch 'jk/revision-squelch-gcc-warning'Junio C Hamano
2021-07-08Merge branch 'ah/uninitialized-reads-fix'Junio C Hamano
2021-07-08Merge branch 'js/no-more-multimail'Junio C Hamano
2021-07-08Merge branch 'js/subtree-on-windows-fix'Junio C Hamano
2021-07-08Merge branch 'dd/svn-test-wo-locale-a'Junio C Hamano