| Commit message (Expand) | Author | Age | Files | Lines |
* | sequencer: update reading author-script | Johannes Schindelin | 2017-01-17 | 1 | -0/+16 |
* | Merge branch 'js/rebase-i-commentchar-fix' | Junio C Hamano | 2016-11-23 | 1 | -0/+11 |
|\ |
|
| * | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fix | Johannes Schindelin | 2016-11-21 | 1 | -1/+1 |
| * | rebase -i: highlight problems with core.commentchar | Johannes Schindelin | 2016-11-21 | 1 | -0/+11 |
* | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-advise | Ralf Thielow | 2016-09-07 | 1 | -3/+3 |
* | | t3404: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 | 1 | -1/+1 |
* | | Merge branch 'js/rebase-i-tests' | Junio C Hamano | 2016-07-28 | 1 | -0/+8 |
|\ \ |
|
| * | | t3404: add a test for the --gpg-sign option | Johannes Schindelin | 2016-07-07 | 1 | -0/+8 |
* | | | Merge branch 'js/t3404-grammo-fix' | Junio C Hamano | 2016-07-13 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | t3404: fix a grammo (commands are ran -> commands are run)js/t3404-grammo-fix | Johannes Schindelin | 2016-06-29 | 1 | -1/+1 |
* | | | | tests: unpack-trees: update to use test_i18n* functions | Vasco Almeida | 2016-06-17 | 1 | -2/+2 |
* | | | | i18n: rebase-interactive: mark here-doc strings for translation | Vasco Almeida | 2016-06-17 | 1 | -7/+7 |
| |/ /
|/| | |
|
* | | | t3404: fix typojs/t3404-typofix | Johannes Schindelin | 2016-05-10 | 1 | -1/+1 |
* | | | Merge branch 'jk/use-write-script-more' | Junio C Hamano | 2016-04-22 | 1 | -4/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | t3404: use write_scriptjk/use-write-script-more | Junio C Hamano | 2016-04-12 | 1 | -4/+3 |
* | | | t3404: cleanup double empty lines between testssb/rebase-x | Stefan Beller | 2016-03-18 | 1 | -6/+0 |
* | | | rebase: decouple --exec from --interactive | Stefan Beller | 2016-03-18 | 1 | -7/+6 |
|/ / |
|
* | | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-options | Fabian Ruch | 2015-12-11 | 1 | -0/+16 |
* | | Merge branch 'cb/t3404-shellquote' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
|\ \ |
|
| * | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquote | Charles Bailey | 2015-12-04 | 1 | -1/+1 |
* | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+12 |
|\ \ \ |
|
| * | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warn | Junio C Hamano | 2015-10-28 | 1 | -1/+1 |
| * | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings | Johannes Schindelin | 2015-10-28 | 1 | -0/+12 |
| |/ / |
|
* | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+15 |
|\ \ \
| |/ / |
|
| * | | rebase-i: loosen over-eager check_bad_cmd check | Matthieu Moy | 2015-10-05 | 1 | -0/+15 |
* | | | Merge branch 'dt/reflog-tests' | Junio C Hamano | 2015-08-12 | 1 | -5/+5 |
|\ \ \ |
|
| * | | | tests: remove some direct access to .git/logsdt/reflog-tests | David Turner | 2015-07-28 | 1 | -5/+5 |
| * | | | Merge branch 'ph/rebase-i-redo' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+47 |
| |\ \ \ |
|
* | \ \ \ | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 | 1 | -0/+123 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | git rebase -i: add static check for commands and SHA-1 | Galan Rémi | 2015-06-30 | 1 | -0/+39 |
| * | | | | git rebase -i: warn about removed commits | Galan Rémi | 2015-06-30 | 1 | -0/+66 |
| * | | | | git-rebase -i: add command "drop" to remove a commit | Galan Rémi | 2015-06-30 | 1 | -0/+18 |
* | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' | Junio C Hamano | 2015-07-13 | 1 | -0/+21 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skip | Johannes Schindelin | 2015-06-29 | 1 | -1/+1 |
| * | | | | t3404: demonstrate CHERRY_PICK_HEAD bug | Johannes Schindelin | 2015-06-29 | 1 | -0/+21 |
* | | | | | Merge branch 'ph/rebase-i-redo' | Junio C Hamano | 2015-05-19 | 1 | -0/+47 |
|\ \ \ \ \
| |_|/ / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redo | Phil Hord | 2015-04-29 | 1 | -0/+47 |
| * | | | Merge branch 'es/rebase-i-count-todo' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+9 |
| |\ \ \ |
|
* | | | | | t: fix trivial &&-chain breakage | Jeff King | 2015-03-20 | 1 | -1/+1 |
* | | | | | t: fix moderate &&-chain breakage | Jeff King | 2015-03-20 | 1 | -1/+1 |
* | | | | | Merge branch 'es/rebase-i-count-todo' | Junio C Hamano | 2015-03-17 | 1 | -0/+9 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | rebase-interactive: suppress whitespace preceding item count | Eric Sunshine | 2015-03-06 | 1 | -0/+9 |
| |/ / |
|
* | | | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrev | Kirill A. Shutemov | 2015-01-22 | 1 | -0/+7 |
|/ / |
|
* | | Merge branch 'mt/rebase-i-keep-empty-test' | Junio C Hamano | 2014-06-06 | 1 | -0/+8 |
|\ \ |
|
| * | | rebase --keep-empty -i: add testmt/rebase-i-keep-empty-test | Michael S. Tsirkin | 2014-05-19 | 1 | -0/+8 |
* | | | tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshell | David Tran | 2014-03-19 | 1 | -56/+13 |
|/ / |
|
* | | Merge branch 'es/rebase-i-no-abbrev' | Junio C Hamano | 2013-09-11 | 1 | -2/+87 |
|\ \ |
|
| * | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrev | Junio C Hamano | 2013-08-25 | 1 | -1/+1 |
| * | | t3404: rebase -i: demonstrate short SHA-1 collision | Eric Sunshine | 2013-08-25 | 1 | -0/+24 |
| * | | t3404: make tests more self-contained | Eric Sunshine | 2013-08-25 | 1 | -2/+63 |