summaryrefslogtreecommitdiff
path: root/t/t3501-revert-cherry-pick.sh
AgeCommit message (Expand)AuthorFilesLines
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modLibravatar Elijah Newren1-1/+1
2018-05-08merge-recursive: improve add_cacheinfo error handlingLibravatar Elijah Newren1-4/+3
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-1/+1
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Libravatar Junio C Hamano1-1/+1
2018-04-11Merge branch 'nd/combined-test-helper'Libravatar Junio C Hamano1-1/+1
2018-03-27t/helper: merge test-chmtime into test-toolLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-1/+1
2018-01-19Tighten and correct a few testcases for merging and cherry-pickingLibravatar Elijah Newren1-2/+5
2016-12-19Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano1-0/+12
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyLibravatar Johannes Schindelin1-1/+1
2016-11-28cherry-pick: demonstrate a segmentation faultLibravatar Johannes Schindelin1-0/+12
2016-10-21sequencer: start error messages consistently with lower caseLibravatar Johannes Schindelin1-1/+1
2013-10-23Merge branch 'hu/cherry-pick-previous-branch'Libravatar Junio C Hamano1-0/+12
2013-10-10cherry-pick: handle "-" after parsing optionsLibravatar Jeff King1-0/+12
2013-09-20Merge branch 'hu/cherry-pick-previous-branch'Libravatar Junio C Hamano1-0/+20
2013-09-09cherry-pick: allow "-" as abbreviation of '@{-1}'Libravatar Hiroshige Umino1-0/+20
2013-09-05typofix: cherry is spelled with two arsLibravatar Junio C Hamano1-1/+1
2012-12-23learn to pick/revert into unborn branchLibravatar Martin von Zweigbergk1-0/+9
2012-08-27Fix tests under GETTEXT_POISON on parseoptLibravatar Jiang Xin1-2/+2
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Libravatar Junio C Hamano1-2/+2
2011-03-09i18n: git-revert "Your local changes" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-11-10cherry-pick/revert: transparently refresh indexLibravatar Jonathan Nieder1-0/+10
2010-06-30Merge branch 'cc/cherry-pick-stdin'Libravatar Junio C Hamano1-0/+18
2010-06-29revert: do not rebuild argv on heapLibravatar Jonathan Nieder1-0/+18
2010-06-13commit: use value of GIT_REFLOG_ACTION env variable as reflog messageLibravatar Christian Couder1-2/+4
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-1/+1
2009-01-15t3501: check that commits are actually doneLibravatar Stephan Beyer1-0/+2
2008-03-02revert: actually check for a dirty indexLibravatar Jeff King1-0/+9
2007-11-02Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.Libravatar Kristian Høgsberg1-2/+2
2007-01-14Use merge-recursive in git-revert/git-cherry-pickLibravatar Junio C Hamano1-0/+62
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 21:35:21 +0000