On Tue, 22 Nov 2016, Daniel Vetter <daniel.vetter@xxxxxxxx> 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@xxxxxxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
