From b80da424a13107c239ed40573fae3d692d19b6cd Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 23 Jan 2009 11:31:21 +1100 Subject: [PATCH] git-am: implement --reject option passed to git-apply With --reject, git-am simply passes the --reject option to git-apply and thus allows people to work with reject files if they so prefer. Signed-off-by: martin f. krafft Signed-off-by: Junio C Hamano --- Documentation/git-am.txt | 2 ++ git-am.sh | 3 +++ t/t4252-am-options.sh | 11 ++++++++++- t/t4252/am-test-6-1 | 21 +++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 t/t4252/am-test-6-1 diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 5cbbe76937..efd311b1ce 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--whitespace=