summaryrefslogtreecommitdiffstats
path: root/t/t3422-rebase-incompatible-options.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* rebase: fully ignore rebase.autoSquash without -iAndy Koppe2023-11-161-12/+0
* rebase: add a config option for --rebase-mergesAlex Henrie2023-03-271-0/+17
* rebase: provide better error message for apply options vs. merge configElijah Newren2023-01-251-0/+24
* rebase: add coverage of other incompatible optionsElijah Newren2023-01-251-0/+15
* rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren2023-01-251-0/+10
* rebase: fix docs about incompatibilities with --rootElijah Newren2023-01-251-0/+4
* rebase: flag --apply and --merge as incompatibleElijah Newren2023-01-251-0/+3
* rebase: mark --update-refs as requiring the merge backendElijah Newren2023-01-251-5/+10
* checkout: fix "branch info" memory leaksÆvar Arnfjörð Bjarmason2021-11-181-0/+2
* tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-081-11/+0
* rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-171-1/+0
* rebase -i: add --ignore-whitespace flagRohit Ashiwal2020-07-131-1/+0
* 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