summaryrefslogtreecommitdiff
path: root/t/t3501-revert-cherry-pick.sh
Commit message (Expand)AuthorAgeFilesLines
* t/t3501-revert-cherry-pick.sh: clarify scope of the fileOswald Buddenhagen2023-05-011-9/+9
* sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-061-0/+1
* Merge branch 'jc/revert-show-parent-info'Junio C Hamano2022-06-151-0/+37
|\
| * revert: --reference should apply only to 'revert', not 'cherry-pick'Junio C Hamano2022-05-311-0/+6
| * revert: optionally refer to commit in the "reference" formatJunio C Hamano2022-05-261-0/+31
* | t3501: remove test -f and stop ignoring git <cmd> exit codeKhalid Masum2022-04-061-5/+4
|/
* t0000-t3999: detect and signal failure within loopEric Sunshine2021-12-131-1/+1
* cherry-pick: use better advice messageZheNing Hu2021-08-231-0/+16
* t3[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-3/+3
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t: don't spuriously close and reopen quotesMartin Ågren2020-08-061-2/+2
* Merge branch 'rs/test-cleanup'Junio C Hamano2019-12-251-1/+1
|\
| * t3501: don't create unused fileRené Scharfe2019-12-181-1/+1
* | t: teach test_cmp_rev to accept ! for not-equalsDenton Liu2019-11-211-1/+1
|/
* merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren2018-05-081-1/+1
* merge-recursive: improve add_cacheinfo error handlingElijah Newren2018-05-081-4/+3
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-1/+1
* Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-1/+1
* Merge branch 'nd/combined-test-helper'Junio C Hamano2018-04-111-1/+1
|\
| * t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy2018-03-271-1/+1
* | merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-271-1/+1
|/
* Tighten and correct a few testcases for merging and cherry-pickingElijah Newren2018-01-191-2/+5
* Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-12-191-0/+12
|\
| * merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin2016-11-281-1/+1
| * cherry-pick: demonstrate a segmentation faultJohannes Schindelin2016-11-281-0/+12
* | sequencer: start error messages consistently with lower caseJohannes Schindelin2016-10-211-1/+1
|/
* Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-10-231-0/+12
|\
| * cherry-pick: handle "-" after parsing optionshu/cherry-pick-previous-branchJeff King2013-10-101-0/+12
* | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-09-201-0/+20
|\ \ | |/
| * cherry-pick: allow "-" as abbreviation of '@{-1}'Hiroshige Umino2013-09-091-0/+20
* | typofix: cherry is spelled with two arsjc/commit-is-spelled-with-two-emsJunio C Hamano2013-09-051-1/+1
|/
* learn to pick/revert into unborn branchMartin von Zweigbergk2012-12-231-0/+9
* Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-271-2/+2
* i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano2011-04-131-2/+2
* i18n: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
* cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-0/+10
* Merge branch 'cc/cherry-pick-stdin'Junio C Hamano2010-06-301-0/+18
|\
| * revert: do not rebuild argv on heapJonathan Nieder2010-06-291-0/+18
* | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-131-2/+4
|/
* Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-1/+1
* t3501: check that commits are actually doneStephan Beyer2009-01-151-0/+2
* revert: actually check for a dirty indexJeff King2008-03-021-0/+9
* Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.Kristian Høgsberg2007-11-021-2/+2
* Use merge-recursive in git-revert/git-cherry-pickJunio C Hamano2007-01-141-0/+62
View Lorry Controller Status