aboutsummaryrefslogtreecommitdiff
path: root/t/t3400-rebase.sh
Commit message (Expand)AuthorAge
* rebase: fix fork-point with zero argumentsJohn Keeping2014-01-09
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-10
* Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-24
|\
| * rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-14
| * t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-14
* | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-23
|\ \
| * | tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk2013-06-07
| * | add tests for rebasing merged historyMartin von Zweigbergk2013-06-07
| |/
* | Merge branch 'fc/show-non-empty-errors-in-test'Junio C Hamano2013-06-20
|\ \ | |/ |/|
| * test: test_must_be_empty helperJunio C Hamano2013-06-09
* | Merge branch 'ph/rebase-original'Junio C Hamano2013-04-26
|\ \
| * | rebase: find orig_head unambiguouslyPhil Hord2013-04-23
| |/
* | t3400: use test_config to set/unset git config variablesYann Droneaud2013-03-25
|/
* i18n: rebase: mark messages for translationJiang Xin2012-07-25
* Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto2012-03-04
* Merge branch 'jc/parse-date-raw'Junio C Hamano2012-02-10
|\
| * parse_date(): '@' prefix forces git-timestampJunio C Hamano2012-02-03
* | test: fix '&&' chainingRamkumar Ramachandra2011-12-08
|/
* rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-10
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-21
|\
| * unpack_trees: group error messages by typeMatthieu Moy2010-08-11
* | rebase: protect against diff.renames configurationJunio C Hamano2010-07-23
* | t3400 (rebase): whitespace cleanupJonathan Nieder2010-07-23
|/
* Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-27
|\
| * am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-16
* | rebase: improve error message when upstream argument is missingJonathan Nieder2010-05-31
|/
* Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\
| * rebase: support automatic notes copyingThomas Rast2010-03-12
* | tests: consolidate CR removal/addition functionsStephen Boyd2010-01-25
|/
* Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano2009-08-05
* am, rebase: teach quiet optionStephen Boyd2009-06-18
* t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to CNguyễn Thái Ngọc Duy2009-05-24
* test-lib: Introduce test_chmod and use it instead of update-index --chmodJohannes Sixt2009-03-19
* t3400-rebase: Move detached HEAD check earlierJohannes Sixt2009-03-01
* Add two extra tests for git rebaseJohannes Schindelin2009-02-08
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-03
* Merge branch 'bd/tests'Junio C Hamano2008-05-14
|\
| * Don't use the 'export NAME=value' in the test scripts.Bryan Donlan2008-05-05
* | fix bsd shell negationJeff King2008-05-13
|/
* Sane use of test_expect_failureJunio C Hamano2008-02-01
* apply --index-info: fall back to current index for mode changesJohannes Schindelin2007-09-16
* Allow rebase to run if upstream is completely mergedJohannes Sixt2007-07-04
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* git rebase loses author name/email if given bad email addressAmos Waterland2005-12-14