summaryrefslogtreecommitdiff
path: root/t/t3400-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-101-2/+4
* 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-52/+1
|\ \
| * | tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk2013-06-071-22/+0
| * | add tests for rebasing merged historyMartin von Zweigbergk2013-06-071-30/+1
| |/
* | Merge branch 'fc/show-non-empty-errors-in-test'Junio C Hamano2013-06-201-1/+1
|\ \ | |/ |/|
| * test: test_must_be_empty helperJunio C Hamano2013-06-091-1/+1
* | Merge branch 'ph/rebase-original'Junio C Hamano2013-04-261-0/+7
|\ \
| * | rebase: find orig_head unambiguouslyPhil Hord2013-04-231-0/+7
| |/
* | t3400: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
|/
* i18n: rebase: mark messages for translationJiang Xin2012-07-251-4/+4
* Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-4/+2
* Merge branch 'jc/parse-date-raw'Junio C Hamano2012-02-101-0/+23
|\
| * parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-031-0/+23
* | test: fix '&&' chainingRamkumar Ramachandra2011-12-081-2/+2
|/
* rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-101-9/+18
* 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
* | rebase: protect against diff.renames configurationJunio C Hamano2010-07-231-1/+23
* | t3400 (rebase): whitespace cleanupJonathan Nieder2010-07-231-90/+92
|/
* Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-271-2/+7
|\
| * am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-161-2/+7
* | rebase: improve error message when upstream argument is missingJonathan Nieder2010-05-311-1/+12
|/
* Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-0/+17
|\
| * rebase: support automatic notes copyingThomas Rast2010-03-121-0/+17
* | tests: consolidate CR removal/addition functionsStephen Boyd2010-01-251-4/+0
|/
* Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano2009-08-051-2/+24
* am, rebase: teach quiet optionStephen Boyd2009-06-181-6/+13
* t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to CNguyễn Thái Ngọc Duy2009-05-241-0/+31
* test-lib: Introduce test_chmod and use it instead of update-index --chmodJohannes Sixt2009-03-191-2/+2
* t3400-rebase: Move detached HEAD check earlierJohannes Sixt2009-03-011-4/+4
* Add two extra tests for git rebaseJohannes Schindelin2009-02-081-1/+12
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-031-3/+3
* Merge branch 'bd/tests'Junio C Hamano2008-05-141-1/+2
|\
| * Don't use the 'export NAME=value' in the test scripts.Bryan Donlan2008-05-051-1/+2
* | fix bsd shell negationJeff King2008-05-131-2/+2
|/
* Sane use of test_expect_failureJunio C Hamano2008-02-011-2/+2
* apply --index-info: fall back to current index for mode changesJohannes Schindelin2007-09-161-0/+15
* Allow rebase to run if upstream is completely mergedJohannes Sixt2007-07-041-1/+38
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-3/+3
* git rebase loses author name/email if given bad email addressAmos Waterland2005-12-141-0/+34
View Lorry Controller Status