diff options
| author | martin f. krafft <madduck@madduck.net> | 2009-01-23 11:31:21 +1100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 17:00:12 -0800 |
| commit | b80da424a13107c239ed40573fae3d692d19b6cd (patch) | |
| tree | 48fd506aeee6cc46c23f2c0b1ef43db37b382ae0 /git-am.sh | |
| parent | d930508903909ad5e700dd25e3858a1b2d69ed12 (diff) | |
| download | git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.gz git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.xz | |
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>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -19,6 +19,7 @@ whitespace= pass it through git-apply directory= pass it through git-apply C= pass it through git-apply p= pass it through git-apply +reject pass it through git-apply resolvemsg= override error message when patch failure occurs r,resolved to be used after a patch failure skip skip the current patch @@ -168,6 +169,8 @@ do git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;; -C|-p) git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;; + --reject) + git_apply_opt="$git_apply_opt $1" ;; --) shift; break ;; *) |