summaryrefslogtreecommitdiffstats
path: root/t/t3422-rebase-incompatible-options.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-121-0/+2
* Merge branch 'ra/rebase-i-more-options'Junio C Hamano2019-12-101-2/+0
|\
| * rebase -i: support --committer-date-is-author-dateRohit Ashiwal2019-11-021-1/+0
| * rebase -i: add --ignore-whitespace flagRohit Ashiwal2019-11-021-1/+0
* | rebase -r: support merge strategies other than `recursive`Johannes Schindelin2019-07-311-10/+0
|/
* tests: mark a couple more test cases as requiring `rebase -p`Johannes Schindelin2019-05-281-2/+3
* git-rebase: error out when incompatible options passedElijah Newren2018-06-271-8/+8
* t3422: new testcases for checking when incompatible options passedElijah Newren2018-06-271-0/+88