Re: [PATCH 0/5] disallow symlinks for .gitignore and .gitattributes
- From
Stefan Beller <sbeller@google.com>
- Date
- Nov 2, 2016, 19:46 UTC
- Message-ID
- <CAGZ79kY195Bff5bUVm44Bx7+XzDDehYbRxgdii4s040pQXRRSQ@mail.gmail.com>
- In-Reply-To
- <20161102130432.d3zprdul4sqgcfwu@sigill.intra.peff.net>
On Wed, Nov 2, 2016 at 6:04 AM, Jeff King <peff@peff.net> wrote:
> > attr.c | 58 ++++++++++++++++++++++++++++++++-------------------
$ git diff --stat origin/master..origin/sb/attr |grep attr.c attr.c | 531 +-
From a cursory read of your series this may result in a merge conflict, but would be easily fixable (changed signature of functions that clash).