Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
AgeCommit message (Expand)Author
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano
2023-10-19t7601: use "test_path_is_file" etc. instead of "test -f"Dorcas AnonoLitunya
2021-11-19pull: should be noop when already-up-to-dateErwin Villejo
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano
2021-07-22pull: fix handling of multiple headsElijah 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-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
2020-12-16pull: display default warning only when non-ffFelipe Contreras
2020-11-20pull: colorize the hint about setting `pull.rebase`Johannes Schindelin
2020-09-25pull: don't warn if pull.ff has been setAlex Henrie
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie
2015-05-18pull: make pull.ff=true override merge.ffPaul Tan
2014-01-16pull: add pull.ff configurationDavid Aguilar
2013-07-29many small typofixesOndřej Bílka
2013-04-13Correct common spelling mistakes in comments and testsStefano Lattarini
2010-10-07t7601 (merge-pull-config): add missing &&Elijah Newren
2008-09-04tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-23t7601: extend the 'merge picks up the best result' testMiklos Vajna
2008-07-22builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna
2008-07-07Fix t7601-merge-pull-config.sh on AIXMiklos Vajna
2008-07-01Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna
    generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 18:06:22 +0300