summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren2-3/+17
2021-07-22pull: since --ff-only overrides, handle it firstLibravatar Elijah Newren1-8/+8
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie5-9/+20
2021-07-20t7601: add tests of interactions with multiple merge heads and configLibravatar Elijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsLibravatar Elijah Newren1-0/+182
2021-07-13The fourth batchLibravatar Junio C Hamano1-0/+26
2021-07-13Merge branch 'rs/grep-parser-fix'Libravatar Junio C Hamano2-0/+11
2021-07-13Merge branch 'bk/doc-commit-typofix'Libravatar Junio C Hamano1-1/+1
2021-07-13Merge branch 'dc/p4-binary-submit-fix'Libravatar Junio C Hamano1-2/+5
2021-07-13Merge branch 'ab/pre-auto-gc-hook-test'Libravatar Junio C Hamano1-0/+46
2021-07-13Merge branch 'jk/union-merge-binary'Libravatar Junio C Hamano2-4/+24
2021-07-13Merge branch 'mr/cmake'Libravatar Junio C Hamano1-9/+28
2021-07-13Merge branch 'ab/describe-tests-fix'Libravatar Junio C Hamano1-62/+72
2021-07-13Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano14-107/+312
2021-07-13Merge branch 'hn/prep-tests-for-reftable'Libravatar Junio C Hamano18-159/+170
2021-07-13Merge branch 'fc/push-simple-updates-cleanup'Libravatar Junio C Hamano1-59/+34
2021-07-13Merge branch 'fc/push-simple-updates'Libravatar Junio C Hamano2-23/+38
2021-07-13Merge branch 'zh/cat-file-batch-fix'Libravatar Junio C Hamano2-6/+26
2021-07-08The third batchLibravatar Junio C Hamano1-0/+77
2021-07-08Merge branch 'js/stop-exporting-bogus-columns'Libravatar Junio C Hamano1-3/+13
2021-07-08Merge branch 'dd/document-log-decorate-default'Libravatar Junio C Hamano1-1/+3
2021-07-08Merge branch 'ar/test-code-cleanup'Libravatar Junio C Hamano7-8/+8
2021-07-08Merge branch 'ba/object-info'Libravatar Junio C Hamano1-1/+1
2021-07-08Merge branch 'ab/progress-cleanup'Libravatar Junio C Hamano1-6/+3
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Libravatar Junio C Hamano1-14/+8
2021-07-08Merge branch 'ms/mergetools-kdiff3-on-windows'Libravatar Junio C Hamano1-0/+9
2021-07-08Merge branch 'ab/cmd-foo-should-return'Libravatar Junio C Hamano9-14/+13
2021-07-08Merge branch 'ar/doc-libera-chat-in-my-first-contrib'Libravatar Junio C Hamano1-2/+2
2021-07-08Merge branch 'ar/mailinfo-memcmp-to-skip-prefix'Libravatar Junio C Hamano1-2/+2
2021-07-08Merge branch 'jk/doc-max-pack-size'Libravatar Junio C Hamano3-10/+23
2021-07-08Merge branch 'ab/fix-columns-to-80-during-tests'Libravatar Junio C Hamano1-2/+3
2021-07-08Merge branch 'ar/more-typofix'Libravatar Junio C Hamano4-4/+4
2021-07-08Merge branch 'fw/complete-cmd-idx-fix'Libravatar Junio C Hamano1-0/+1
2021-07-08Merge branch 'jk/test-without-readlink-1'Libravatar Junio C Hamano3-3/+9
2021-07-08Merge branch 'jx/sideband-cleanup'Libravatar Junio C Hamano32-1013/+1036
2021-07-08Merge branch 'jk/test-avoid-globmatch-with-skip-patterns'Libravatar Junio C Hamano1-12/+22
2021-07-08Merge branch 'jv/userdiff-csharp-update'Libravatar Junio C Hamano1-1/+1
2021-07-08Merge branch 'ab/config-hooks-path-testfix'Libravatar Junio C Hamano1-0/+1
2021-07-08Merge branch 'fc/pull-cleanups'Libravatar Junio C Hamano1-15/+11
2021-07-08Merge branch 'jk/bitmap-tree-optim'Libravatar Junio C Hamano3-0/+22
2021-07-08Merge branch 'ah/graph-typofix'Libravatar Junio C Hamano1-1/+1
2021-07-08Merge branch 'jx/t6020-with-older-bash'Libravatar Junio C Hamano1-19/+31
2021-07-08Merge branch 'ar/typofix'Libravatar Junio C Hamano14-16/+15
2021-07-08Merge branch 'jk/revision-squelch-gcc-warning'Libravatar Junio C Hamano1-2/+3
2021-07-08Merge branch 'ah/uninitialized-reads-fix'Libravatar Junio C Hamano3-4/+4
2021-07-08Merge branch 'js/no-more-multimail'Libravatar Junio C Hamano12-6303/+2
2021-07-08Merge branch 'js/subtree-on-windows-fix'Libravatar Junio C Hamano1-4/+8
2021-07-08Merge branch 'dd/svn-test-wo-locale-a'Libravatar Junio C Hamano6-22/+32
2021-07-08Merge branch 'fc/doc-default-to-upstream-config'Libravatar Junio C Hamano1-1/+1
2021-07-08Merge branch 'js/trace2-discard-event-docfix'Libravatar Junio C Hamano1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 07:30:57 +0000