summaryrefslogtreecommitdiff
path: root/t/t3415-rebase-autosquash.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm/rebase-i'Junio C Hamano2021-03-261-14/+16
|\
| * rebase -i: comment out squash!/fixup! subjects from squash messagePhillip Wood2021-01-291-14/+16
* | tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason2021-02-101-5/+5
* | Merge branch 'js/rebase-i-commit-cleanup-fix'Junio C Hamano2021-02-101-0/+8
|\ \
| * | rebase -i: do leave commit message intact in fixup! chainsJohannes Schindelin2021-01-281-0/+8
| |/
* | t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-2/+2
* | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
|/
* Merge branch 'js/rebase-autosquash-double-fixup-fix'Junio C Hamano2020-05-141-0/+16
|\
| * rebase --autosquash: fix a potential segfaultJohannes Schindelin2020-05-091-0/+16
* | t3415: increase granularity of test_auto_{fixup,squash}()Denton Liu2020-01-271-20/+44
* | t3415: stop losing return codes of git commandsDenton Liu2020-01-271-31/+82
* | tests (rebase): spell out the `--force-rebase` optionJohannes Schindelin2019-04-021-1/+1
|/
* rebase -i: be careful to wrap up fixup/squash chainsJohannes Schindelin2018-09-041-1/+1
* rebase -i --autosquash: demonstrate a problem skipping the last squashJohannes Schindelin2018-09-041-0/+19
* rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-1/+1
* t3415: test fixup with wrapped onelineJohannes Schindelin2017-07-271-0/+14
* t3415: verify that an empty instructionFormat is handled as beforeJohannes Schindelin2017-07-271-0/+12
* tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason2017-05-111-5/+5
* rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-testsJohannes Schindelin2016-07-071-0/+9
* rebase -i: demonstrate a bug with --autosquashJohannes Schindelin2016-07-071-0/+24
* git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheetMichael Rappazzo2015-06-151-0/+21
* rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-271-0/+57
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-111-8/+8
* Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-031-2/+27
|\
| * add tests of commit --squashPat Notz2010-11-041-0/+4
| * add tests of commit --fixupPat Notz2010-11-041-2/+23
* | rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard2010-11-091-0/+31
* | rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard2010-11-091-0/+43
|/
* t/t3415: use && where applicable.Yann Dirson2010-10-061-3/+3
* add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-141-8/+32
* rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+73
View Lorry Controller Status