summaryrefslogtreecommitdiff
path: root/t/t3502-cherry-pick-merge.sh
AgeCommit message (Collapse)Author
2007-11-05t3502: Disambiguate between file and rev by adding --Brian Gernhardt
On a case insensitive file system, this test fails because git-diff doesn't know if it is asking for the file "A" or the tag "a". Adding "--" at the end of the ambiguous commands allows the test to finish properly. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-03cherry-pick/revert -m: add testsJunio C Hamano
This adds a new test to check cherry-pick/revert of a merge commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>