From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH] dim: Enable --scissors by default
Date: Tue, 22 Nov 2016 17:51:20 +0200 [thread overview]
Message-ID: <87y40bwm13.fsf@intel.com> (raw)
In-Reply-To: <20161122153846.23854-1-daniel.vetter@ffwll.ch>
On Tue, 22 Nov 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> I never knew this even was a thing, and plain git am cuts everything
> below the scissors line (since it matches the --- of a diffstat
> start).
>
> Cc: Robert Bragg <robert@sixbynine.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> dim | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index 8697eaee92cc..0b437c9c0a18 100755
> --- a/dim
> +++ b/dim
> @@ -556,7 +556,7 @@ function dim_apply_branch
> sob=-s
> fi
>
> - cat $file | git am -3 $sob "$@"
> + cat $file | git am --scissors -3 $sob "$@"
Side note, -3 rarely helps for us because nightly moves on, and the tree
info in the patch is lost.
BR,
Jani.
>
> if [ -n "$message_id" ]; then
> dim_commit_add_tag "Link: http://patchwork.freedesktop.org/patch/msgid/$message_id"
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-11-22 15:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 15:38 [PATCH] dim: Enable --scissors by default Daniel Vetter
2016-11-22 15:51 ` Jani Nikula [this message]
2016-11-22 17:36 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y40bwm13.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.