mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Teach git-am to pass -p option down to git-apply
This is originally from Andy Parkins whose patch used --patchdepth; let's use -p which is more in line with the underlying git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
c5c3fc9851
commit
2092a1fefd
|
@ -10,7 +10,8 @@ SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
|
'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
|
||||||
[--interactive] [--whitespace=<option>] <mbox>...
|
[--interactive] [--whitespace=<option>] [-C<n>] [-p<n>]
|
||||||
|
<mbox>...
|
||||||
'git-am' [--skip | --resolved]
|
'git-am' [--skip | --resolved]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
@ -68,8 +69,8 @@ default. You could use `--no-utf8` to override this.
|
||||||
This flag is passed to the `git-apply` program that applies
|
This flag is passed to the `git-apply` program that applies
|
||||||
the patch.
|
the patch.
|
||||||
|
|
||||||
-C<n>::
|
-C<n>, -p<n>::
|
||||||
This flag is passed to the `git-apply` program that applies
|
These flag are passed to the `git-apply` program that applies
|
||||||
the patch.
|
the patch.
|
||||||
|
|
||||||
--interactive::
|
--interactive::
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Copyright (c) 2005, 2006 Junio C Hamano
|
# Copyright (c) 2005, 2006 Junio C Hamano
|
||||||
|
|
||||||
USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
|
USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
|
||||||
[--interactive] [--whitespace=<option>] [-CNUM] <mbox>...
|
[--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>...
|
||||||
or, when resuming [--skip | --resolved]'
|
or, when resuming [--skip | --resolved]'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
set_reflog_action am
|
set_reflog_action am
|
||||||
|
@ -142,10 +142,7 @@ do
|
||||||
--sk|--ski|--skip)
|
--sk|--ski|--skip)
|
||||||
skip=t; shift ;;
|
skip=t; shift ;;
|
||||||
|
|
||||||
--whitespace=*)
|
--whitespace=*|-C*|-p*)
|
||||||
git_apply_opt="$git_apply_opt $1"; shift ;;
|
|
||||||
|
|
||||||
-C*)
|
|
||||||
git_apply_opt="$git_apply_opt $1"; shift ;;
|
git_apply_opt="$git_apply_opt $1"; shift ;;
|
||||||
|
|
||||||
--resolvemsg=*)
|
--resolvemsg=*)
|
||||||
|
|
Loading…
Reference in a new issue