From: Thiago Farina <tfransosi@gmail.com>
Date: Sun, 19 Dec 2010 16:56:58 GMT
Subject: Re: [PATCH] am: Allow passing exclude and include args to apply
Message-ID: <AANLkTik5-oJYsfEoeYjy8E9v4T4_7VBsoGnqg7oXwnbC@mail.gmail.com>
In-Reply-To: <1292775461-26762-1-git-send-email-max@stro.at>

On Sun, Dec 19, 2010 at 2:17 PM, maximilian attems <max@stro.at> wrote:
> When porting patches from dash git to klibc git,
> where dash has a different directory structure those
> switches are handy:
> Exported with format-patch on dash side and used am
> as import for klibc side.
>

I don't know, but this commit message doesn't look good. Can you be
more specific about what the patch does, and what it's trying to fix.
Describing a use case is good, but in this case it isn't help me much
(maybe for others the issue here is clear, but for my taste no).

> Signed-off-by: maximilian attems <max@stro.at>
> ---
>  Documentation/git-am.txt |    5 ++++-
>  git-am.sh                |    4 +++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> index 51297d0..4c65dba 100644
> --- a/Documentation/git-am.txt
> +++ b/Documentation/git-am.txt
> @@ -13,7 +13,8 @@ SYNOPSIS
>         [--3way] [--interactive] [--committer-date-is-author-date]
>         [--ignore-date] [--ignore-space-change | --ignore-whitespace]
>         [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
> -        [--reject] [-q | --quiet] [--scissors | --no-scissors]
> +        [--exclude=PATH] [--include=PATH] [--reject] [-q | --quiet]
> +        [--scissors | --no-scissors]
>         [(<mbox> | <Maildir>)...]
>  'git am' (--continue | --skip | --abort)
>
> @@ -87,6 +88,8 @@ default.   You can use `--no-utf8` to override this.
>  -C<n>::
>  -p<n>::
>  --directory=<dir>::
> +--exclude=<path-pattern>::
> +--include=<path-pattern>::
>  --reject::
>        These flags are passed to the 'git apply' (see linkgit:git-apply[1])
>        program that applies
> diff --git a/git-am.sh b/git-am.sh
> index df09b42..174f6a2 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -22,6 +22,8 @@ whitespace=     pass it through git-apply
>  ignore-space-change pass it through git-apply
>  ignore-whitespace pass it through git-apply
>  directory=      pass it through git-apply
> +exclude=        pass it through git-apply
> +include=        pass it through git-apply
>  C=              pass it through git-apply
>  p=              pass it through git-apply
>  patch-format=   format the patch(es) are in
> @@ -340,7 +342,7 @@ do
>                ;;
>        --resolvemsg)
>                shift; resolvemsg=$1 ;;
> -       --whitespace|--directory)
> +       --whitespace|--directory|--exclude|--include)
>                git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
>        -C|-p)
>                git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>