aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3422-rebase-incompatible-options.sh
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2023-11-16rebase: fully ignore rebase.autoSquash without -iAndy Koppe1-12/+0
2023-03-27rebase: add a config option for --rebase-mergesAlex Henrie1-0/+17
2023-01-25rebase: provide better error message for apply options vs. merge configElijah Newren1-0/+24
2023-01-25rebase: add coverage of other incompatible optionsElijah Newren1-0/+15
2023-01-25rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren1-0/+10
2023-01-25rebase: fix docs about incompatibilities with --rootElijah Newren1-0/+4
2023-01-25rebase: flag --apply and --merge as incompatibleElijah Newren1-0/+3
2023-01-25rebase: mark --update-refs as requiring the merge backendElijah Newren1-5/+10
2021-11-18checkout: fix "branch info" memory leaksÆvar Arnfjörð Bjarmason1-0/+2
2021-09-07tests: stop testing `git rebase --preserve-merges`Johannes Schindelin1-11/+0
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood1-1/+0
2020-07-13rebase -i: add --ignore-whitespace flagRohit Ashiwal1-1/+0
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano1-0/+2
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano1-2/+0
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal1-1/+0
2019-11-02rebase -i: add --ignore-whitespace flagRohit Ashiwal1-1/+0
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin1-10/+0
2019-05-28tests: mark a couple more test cases as requiring `rebase -p`Johannes Schindelin1-2/+3
2018-06-27git-rebase: error out when incompatible options passedElijah Newren1-8/+8
2018-06-27t3422: new testcases for checking when incompatible options passedElijah Newren1-0/+88