On Tue, Nov 22, 2016 at 05:51:20PM +0200, Jani Nikula wrote: > 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. It was still useful for me 1y ago when I pushed most of the patches, and hence likelihood that people based their patches on a -nightly I pushed and hence still had available locally was pretty good. Also, anyone who git worktree shares the dim tree with his own branch repo will benefit from this (at least me for my own patches). So -3 still helps a lot, at least here. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
