summaryrefslogtreecommitdiff
path: root/t/t3415-rebase-autosquash.sh
AgeCommit message (Expand)Author
2022-09-26sequencer: avoid dropping fixup commit that targets self via commit-ishJohannes Altmanninger
2021-03-26Merge branch 'cm/rebase-i'Junio C Hamano
2021-02-11tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason
2021-02-10Merge branch 'js/rebase-i-commit-cleanup-fix'Junio C Hamano
2021-01-29rebase -i: comment out squash!/fixup! subjects from squash messagePhillip Wood
2021-01-28rebase -i: do leave commit message intact in fixup! chainsJohannes Schindelin
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-05-14Merge branch 'js/rebase-autosquash-double-fixup-fix'Junio C Hamano
2020-05-09rebase --autosquash: fix a potential segfaultJohannes Schindelin
2020-01-27t3415: increase granularity of test_auto_{fixup,squash}()Denton Liu
2020-01-27t3415: stop losing return codes of git commandsDenton Liu
2019-04-02tests (rebase): spell out the `--force-rebase` optionJohannes Schindelin
2018-09-04rebase -i: be careful to wrap up fixup/squash chainsJohannes Schindelin
2018-09-04rebase -i --autosquash: demonstrate a problem skipping the last squashJohannes Schindelin
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin
2017-07-27t3415: test fixup with wrapped onelineJohannes Schindelin
2017-07-27t3415: verify that an empty instructionFormat is handled as beforeJohannes Schindelin
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason
2016-07-07rebase -i: we allow extra spaces after fixup!/squash!Johannes Schindelin
2016-07-07rebase -i: demonstrate a bug with --autosquashJohannes Schindelin
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo
2013-06-27rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini
2010-12-04Merge branch 'pn/commit-autosquash'Junio C Hamano
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard
2010-11-04add tests of commit --squashPat Notz
2010-11-04add tests of commit --fixupPat Notz
2010-10-06t/t3415: use && where applicable.Yann Dirson
2010-07-14add configuration variable for --autosquash option of interactive rebaseHeiko Voigt
2010-01-07rebase -i --autosquash: auto-squash commitsNanako Shiraishi