summaryrefslogtreecommitdiff
path: root/t/t3501-revert-cherry-pick.sh
AgeCommit message (Expand)Author
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren
2018-05-08merge-recursive: improve add_cacheinfo error handlingElijah Newren
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-04-11Merge branch 'nd/combined-test-helper'Junio C Hamano
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-01-19Tighten and correct a few testcases for merging and cherry-pickingElijah Newren
2016-12-19Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin
2016-11-28cherry-pick: demonstrate a segmentation faultJohannes Schindelin
2016-10-21sequencer: start error messages consistently with lower caseJohannes Schindelin
2013-10-23Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano
2013-10-10cherry-pick: handle "-" after parsing optionsJeff King
2013-09-20Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano
2013-09-09cherry-pick: allow "-" as abbreviation of '@{-1}'Hiroshige Umino
2013-09-05typofix: cherry is spelled with two arsJunio C Hamano
2012-12-23learn to pick/revert into unborn branchMartin von Zweigbergk
2012-08-27Fix tests under GETTEXT_POISON on parseoptJiang Xin
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano
2011-03-10i18n: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason
2010-11-10cherry-pick/revert: transparently refresh indexJonathan Nieder
2010-06-30Merge branch 'cc/cherry-pick-stdin'Junio C Hamano
2010-06-29revert: do not rebuild argv on heapJonathan Nieder
2010-06-13commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy
2009-01-15t3501: check that commits are actually doneStephan Beyer
2008-03-03revert: actually check for a dirty indexJeff King
2007-11-02Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.Kristian Høgsberg
2007-01-15Use merge-recursive in git-revert/git-cherry-pickJunio C Hamano