summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2016-06-29t3404: fix a grammo (commands are ran -> commands are run)Libravatar Johannes Schindelin1-1/+1
2016-06-17tests: unpack-trees: update to use test_i18n* functionsLibravatar Vasco Almeida1-2/+2
2016-06-17i18n: rebase-interactive: mark here-doc strings for translationLibravatar Vasco Almeida1-7/+7
2016-05-10t3404: fix typoLibravatar Johannes Schindelin1-1/+1
2016-04-22Merge branch 'jk/use-write-script-more'Libravatar Junio C Hamano1-4/+3
2016-04-12t3404: use write_scriptLibravatar Junio C Hamano1-4/+3
2016-03-18t3404: cleanup double empty lines between testsLibravatar Stefan Beller1-6/+0
2016-03-18rebase: decouple --exec from --interactiveLibravatar Stefan Beller1-7/+6
2015-12-11rebase -i: remember merge options beyond continue actionsLibravatar Fabian Ruch1-0/+16
2015-12-11Merge branch 'cb/t3404-shellquote' into maintLibravatar Junio C Hamano1-1/+1
2015-12-04t3404: fix quoting of redirect for some versions of bashLibravatar Charles Bailey1-1/+1
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintLibravatar Junio C Hamano1-0/+12
2015-10-28rebase-i: work around Windows CRLF line endingsLibravatar Junio C Hamano1-1/+1
2015-10-28t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsLibravatar Johannes Schindelin1-0/+12
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintLibravatar Junio C Hamano1-0/+15
2015-10-05rebase-i: loosen over-eager check_bad_cmd checkLibravatar Matthieu Moy1-0/+15
2015-08-12Merge branch 'dt/reflog-tests'Libravatar Junio C Hamano1-5/+5
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Libravatar Junio C Hamano1-0/+123
2015-07-28tests: remove some direct access to .git/logsLibravatar David Turner1-5/+5
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Libravatar Junio C Hamano1-0/+21
2015-06-30git rebase -i: add static check for commands and SHA-1Libravatar Galan Rémi1-0/+39
2015-06-30git rebase -i: warn about removed commitsLibravatar Galan Rémi1-0/+66
2015-06-30git-rebase -i: add command "drop" to remove a commitLibravatar Galan Rémi1-0/+18
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindLibravatar Johannes Schindelin1-1/+1
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugLibravatar Johannes Schindelin1-0/+21
2015-06-05Merge branch 'ph/rebase-i-redo' into maintLibravatar Junio C Hamano1-0/+47
2015-05-19Merge branch 'ph/rebase-i-redo'Libravatar Junio C Hamano1-0/+47
2015-04-29rebase -i: redo tasks that die during cherry-pickLibravatar Phil Hord1-0/+47
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintLibravatar Junio C Hamano1-0/+9
2015-03-20t: fix trivial &&-chain breakageLibravatar Jeff King1-1/+1
2015-03-20t: fix moderate &&-chain breakageLibravatar Jeff King1-1/+1
2015-03-17Merge branch 'es/rebase-i-count-todo'Libravatar Junio C Hamano1-0/+9
2015-03-06rebase-interactive: suppress whitespace preceding item countLibravatar Eric Sunshine1-0/+9
2015-01-22rebase -i: use full object name internally throughout the scriptLibravatar Kirill A. Shutemov1-0/+7
2014-06-06Merge branch 'mt/rebase-i-keep-empty-test'Libravatar Junio C Hamano1-0/+8
2014-05-19rebase --keep-empty -i: add testLibravatar Michael S. Tsirkin1-0/+8
2014-03-19tests: use "env" to run commands with temporary env-var settingsLibravatar David Tran1-56/+13
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Libravatar Junio C Hamano1-2/+87
2013-08-25rebase -i: fix short SHA-1 collisionLibravatar Junio C Hamano1-1/+1
2013-08-25t3404: rebase -i: demonstrate short SHA-1 collisionLibravatar Eric Sunshine1-0/+24
2013-08-25t3404: make tests more self-containedLibravatar Eric Sunshine1-2/+63
2013-08-07die_with_status: use "printf '%s\n'", not "echo"Libravatar Matthieu Moy1-0/+13
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Libravatar Junio C Hamano1-0/+15
2013-07-02Do not ignore merge options in interactive rebaseLibravatar Arnaud Fontaine1-0/+11
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano1-0/+11
2013-06-23rebase -i: use a better reflog messageLibravatar Ramkumar Ramachandra1-0/+15
2013-06-23Merge branch 'mz/rebase-tests'Libravatar Junio C Hamano1-9/+1
2013-06-14rebase: use peel_committish() where appropriateLibravatar Ramkumar Ramachandra1-1/+1
2013-06-14t/rebase: add failing tests for a peculiar revisionLibravatar Ramkumar Ramachandra1-0/+11
2013-06-07add tests for rebasing merged historyLibravatar Martin von Zweigbergk1-9/+1