зеркало из https://github.com/microsoft/git.git
Merge branch 'ma/am-exclude'
* ma/am-exclude: am: Document new --exclude=<path> option am: pass exclude down to apply
This commit is contained in:
Коммит
d8308c79fc
|
@ -13,7 +13,8 @@ SYNOPSIS
|
||||||
[--3way] [--interactive] [--committer-date-is-author-date]
|
[--3way] [--interactive] [--committer-date-is-author-date]
|
||||||
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
|
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
|
||||||
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
|
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
|
||||||
[--reject] [-q | --quiet] [--scissors | --no-scissors]
|
[--exclude=<path>] [--reject] [-q | --quiet]
|
||||||
|
[--scissors | --no-scissors]
|
||||||
[(<mbox> | <Maildir>)...]
|
[(<mbox> | <Maildir>)...]
|
||||||
'git am' (--continue | --skip | --abort)
|
'git am' (--continue | --skip | --abort)
|
||||||
|
|
||||||
|
@ -87,6 +88,7 @@ default. You can use `--no-utf8` to override this.
|
||||||
-C<n>::
|
-C<n>::
|
||||||
-p<n>::
|
-p<n>::
|
||||||
--directory=<dir>::
|
--directory=<dir>::
|
||||||
|
--exclude=<path>::
|
||||||
--reject::
|
--reject::
|
||||||
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
|
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
|
||||||
program that applies
|
program that applies
|
||||||
|
|
|
@ -22,6 +22,7 @@ whitespace= pass it through git-apply
|
||||||
ignore-space-change pass it through git-apply
|
ignore-space-change pass it through git-apply
|
||||||
ignore-whitespace pass it through git-apply
|
ignore-whitespace pass it through git-apply
|
||||||
directory= pass it through git-apply
|
directory= pass it through git-apply
|
||||||
|
exclude= pass it through git-apply
|
||||||
C= pass it through git-apply
|
C= pass it through git-apply
|
||||||
p= pass it through git-apply
|
p= pass it through git-apply
|
||||||
patch-format= format the patch(es) are in
|
patch-format= format the patch(es) are in
|
||||||
|
@ -366,7 +367,7 @@ do
|
||||||
;;
|
;;
|
||||||
--resolvemsg)
|
--resolvemsg)
|
||||||
shift; resolvemsg=$1 ;;
|
shift; resolvemsg=$1 ;;
|
||||||
--whitespace|--directory)
|
--whitespace|--directory|--exclude)
|
||||||
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
|
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
|
||||||
-C|-p)
|
-C|-p)
|
||||||
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
|
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче