summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-021-0/+11
* Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-241-0/+11
|\
| * rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-141-1/+1
| * t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-141-0/+11
* | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-231-9/+1
|\ \ | |/ |/|
| * add tests for rebasing merged historyMartin von Zweigbergk2013-06-071-9/+1
* | test: rebase: fix --interactive testFelipe Contreras2013-05-281-1/+1
|/
* t4304: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
* Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-171-0/+14
|\
| * rebase -i: respect core.commentcharJohn Keeping2013-02-121-0/+14
* | tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk2012-12-221-6/+0
|/
* Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-291-0/+18
|\
| * rebase -i: Add tests for "--edit-todo"Andrew Wong2012-09-171-0/+18
* | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-181-0/+11
|/
* Merge branch 'jx/i18n-1.7.11'Junio C Hamano2012-07-311-1/+1
|\
| * i18n: Rewrite gettext messages start with dashJiang Xin2012-07-261-1/+1
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-251-0/+8
|\ \ | |/ |/|
| * rebase -i: handle fixup of root commit correctlyChris Webb2012-07-241-0/+8
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-151-0/+31
|\ \ | |/
| * t3404: make test 57 work with dash and othersMichael J Gruber2012-07-051-1/+5
| * Add tests for rebase -i --root without --ontoChris Webb2012-06-261-0/+27
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-0/+117
|/
* Merge branch 'maint'Junio C Hamano2012-05-201-0/+1
|\
| * t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt2012-05-201-0/+1
* | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-301-1/+1
|/
* rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-091-0/+30
* rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-261-0/+14
* rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-191-1/+1
* rebase: write a reflog entry when finishingJeff King2011-05-271-1/+1
* Merge branch 'maint'Junio C Hamano2010-12-281-1/+2
|\
| * Fix false positives in t3404 due to SHELL=/bin/falseRobin H. Johnson2010-12-281-1/+2
* | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-0/+1
|\ \
| * | notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-171-0/+1
* | | t3404: do not use 'describe' to implement test_cmp_revJunio C Hamano2010-11-091-2/+2
* | | t3404 (rebase -i): introduce helper to check position of HEADJonathan Nieder2010-11-091-15/+9
* | | t3404 (rebase -i): move comment to descriptionJonathan Nieder2010-11-091-18/+17
* | | t3404 (rebase -i): unroll test_commit loopsJonathan Nieder2010-11-091-12/+11
* | | tests: add missing &&, batch 2Jonathan Nieder2010-11-091-3/+3
| |/ |/|
* | t3404 & t7508: cd inside subshell instead of aroundJens Lehmann2010-09-061-3/+3
* | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-211-2/+63
|\ \
| * | test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy2010-08-111-9/+9
| * | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-111-0/+61
* | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-211-1/+2
|\ \ \ | |_|/ |/| |
| * | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-1/+2
| |/
* | git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-07-251-1/+7
|/
* rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano2010-07-051-0/+18
* Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano2010-06-211-0/+10
|\
| * rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-111-0/+10
* | rebase -i -p: document shortcomingsJonathan Nieder2010-06-111-0/+6
|/
* Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-031-4/+32
|\
View Lorry Controller Status