summaryrefslogtreecommitdiff
path: root/t/t3422-rebase-incompatible-options.sh
AgeCommit message (Expand)AuthorFilesLines
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Libravatar Junio C Hamano1-0/+2
2019-12-10Merge branch 'ra/rebase-i-more-options'Libravatar Junio C Hamano1-2/+0
2019-11-02rebase -i: support --committer-date-is-author-dateLibravatar Rohit Ashiwal1-1/+0
2019-11-02rebase -i: add --ignore-whitespace flagLibravatar Rohit Ashiwal1-1/+0
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-10/+0
2019-05-28tests: mark a couple more test cases as requiring `rebase -p`Libravatar Johannes Schindelin1-2/+3
2018-06-27git-rebase: error out when incompatible options passedLibravatar Elijah Newren1-8/+8
2018-06-27t3422: new testcases for checking when incompatible options passedLibravatar Elijah Newren1-0/+88