summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-08 23:48:47 +0800
committerJunio C Hamano <gitster@pobox.com>2015-06-08 12:42:02 -0700
commit1daaddd1d3fc92e1766fb5d9701db0418c6813bc (patch)
tree1161d4db558efe095364345f9a94abae08d1b586 /ll-merge.c
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff)
downloadgit-1daaddd1d3fc92e1766fb5d9701db0418c6813bc.tar.gz
t4150: test applying StGit patch
By default, an StGit patch separates the subject from the commit message and headers as follows: $subject From: $author_name <$author_email> $message --- $diffstats We test git-am's ability to detect such a patch as an StGit patch, and its ability to be able to extract the commit author, date and message from such a patch. Based-on-patch-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions