summaryrefslogtreecommitdiff
path: root/t/t3415-rebase-autosquash.sh
AgeCommit message (Expand)AuthorFilesLines
2021-03-26Merge branch 'cm/rebase-i'Libravatar Junio C Hamano1-14/+16
2021-02-10tests: remove most uses of C_LOCALE_OUTPUTLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2021-02-10Merge branch 'js/rebase-i-commit-cleanup-fix'Libravatar Junio C Hamano1-0/+8
2021-01-29rebase -i: comment out squash!/fixup! subjects from squash messageLibravatar Phillip Wood1-14/+16
2021-01-28rebase -i: do leave commit message intact in fixup! chainsLibravatar Johannes Schindelin1-0/+8
2020-11-19t34*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-05-14Merge branch 'js/rebase-autosquash-double-fixup-fix'Libravatar Junio C Hamano1-0/+16
2020-05-09rebase --autosquash: fix a potential segfaultLibravatar Johannes Schindelin1-0/+16
2020-01-27t3415: increase granularity of test_auto_{fixup,squash}()Libravatar Denton Liu1-20/+44
2020-01-27t3415: stop losing return codes of git commandsLibravatar Denton Liu1-31/+82
2019-04-02tests (rebase): spell out the `--force-rebase` optionLibravatar Johannes Schindelin1-1/+1
2018-09-04rebase -i: be careful to wrap up fixup/squash chainsLibravatar Johannes Schindelin1-1/+1
2018-09-04rebase -i --autosquash: demonstrate a problem skipping the last squashLibravatar Johannes Schindelin1-0/+19
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperLibravatar Johannes Schindelin1-1/+1
2017-07-27t3415: test fixup with wrapped onelineLibravatar Johannes Schindelin1-0/+14
2017-07-27t3415: verify that an empty instructionFormat is handled as beforeLibravatar Johannes Schindelin1-0/+12
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2016-07-07rebase -i: we allow extra spaces after fixup!/squash!Libravatar Johannes Schindelin1-0/+9
2016-07-07rebase -i: demonstrate a bug with --autosquashLibravatar Johannes Schindelin1-0/+24
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatLibravatar Michael Rappazzo1-0/+21
2013-06-27rebase -i: handle fixup! fixup! in --autosquashLibravatar Andrew Pimlott1-0/+57
2012-04-11tests: modernise style: more uses of test_line_countLibravatar Stefano Lattarini1-8/+8
2010-12-03Merge branch 'pn/commit-autosquash'Libravatar Junio C Hamano1-2/+27
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageLibravatar Kevin Ballard1-0/+31
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashLibravatar Kevin Ballard1-0/+43
2010-11-04add tests of commit --squashLibravatar Pat Notz1-0/+4
2010-11-04add tests of commit --fixupLibravatar Pat Notz1-2/+23
2010-10-06t/t3415: use && where applicable.Libravatar Yann Dirson1-3/+3
2010-07-14add configuration variable for --autosquash option of interactive rebaseLibravatar Heiko Voigt1-8/+32
2010-01-06rebase -i --autosquash: auto-squash commitsLibravatar Nanako Shiraishi1-0/+73