git-am: implement --reject option passed to git-apply
authormartin f. krafft <madduck@madduck.net>
Fri, 23 Jan 2009 00:31:21 +0000 (11:31 +1100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 01:00:12 +0000 (17:00 -0800)
commitb80da424a13107c239ed40573fae3d692d19b6cd
tree48fd506aeee6cc46c23f2c0b1ef43db37b382ae0
parentd930508903909ad5e700dd25e3858a1b2d69ed12
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 <madduck@madduck.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-am.txt
git-am.sh
t/t4252-am-options.sh
t/t4252/am-test-6-1 [new file with mode: 0644]