diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2008-06-01 00:11:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-31 15:42:12 -0700 |
| commit | d3a7b8f5c5ed2a073936e09aa80c8a0b0cf10f5c (patch) | |
| tree | 032fdcd24a13e7b032ef5bd238539511bd5e9ae8 /builtin-diff-tree.c | |
| parent | "git checkout -- paths..." should error out when paths cannot be written (diff) | |
| download | tgif-d3a7b8f5c5ed2a073936e09aa80c8a0b0cf10f5c.tar.xz | |
Add test cases for git-am
Add t/t4151-am.sh that does basic testing of git-am functionality,
including:
* am applies patch correctly
* am changes committer and keeps author
* am --signoff adds Signed-off-by: line
* am stays in branch
* am --signoff does not add Signed-off-by: line if already there
* am without --keep removes Re: and [PATCH] stuff
* am --keep really keeps the subject
* am -3 falls back to 3-way merge
* am pauses on conflict
* am --skip works
* am --resolved works
* am takes patches from a Pine mailbox
* am fails on mail without patch
* am fails on empty patch
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-diff-tree.c')
0 files changed, 0 insertions, 0 deletions