I'm working with a repo that used to be all CRLF. At some point it was
changed to all LF, with `text=auto` in .gitattributes for the sake of
Windows devs. I'm on Linux and have never touched any twiddles relating
to line endings. I'm trying to cherry-pick some commits from before the
switcho
Friedrich MayrhoferThis is the second time i am sending you this mail.I,
Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more
details.
Regards.
Friedrich Mayrhofer
On Sun, Nov 27, 2016 at 05:45:38PM -0800, David Aguilar wrote:
> On Sun, Nov 27, 2016 at 11:55:59AM -0500, Jeff King wrote:
> > On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
> >
> > > Ignoring a non-zero exit code from the merge tool, and assuming a
> > > successful merge in that case,
On Sun, Nov 27, 2016 at 05:45:38PM -0800, David Aguilar wrote:
> I have a patch that makes it so that none of the tools do the
> check_unchanged logic themselves and instead rely on the
> library code to handle it for them. This makes the
> implementation uniform across all tools, and allows tool
On Sun, Nov 27, 2016 at 11:55:59AM -0500, Jeff King wrote:
> On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
>
> > Ignoring a non-zero exit code from the merge tool, and assuming a
> > successful merge in that case, seems like the wrong default behavior
> > to me.
>
> Yeah, I'm inclined
When having log.showSignature enabled by default (as is good practice
with signed commits), it still shows the signature when git-subtree
passes custom format specifiers to git-log. This causes an error when
trying to push a subtree when signed commits are involved.
Adding this command line flag
On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
> Ignoring a non-zero exit code from the merge tool, and assuming a
> successful merge in that case, seems like the wrong default behavior
> to me.
Yeah, I'm inclined to agree. But like I said, I'm not too familiar with
this area, so maybe
On Sat, Nov 26, 2016 at 02:01:36PM +0100, Johannes Schindelin wrote:
> > If you want to control it from outside the test script, you'd need
> > something like:
> >
> > if test "$GIT_TEST_DIFFTOOL" = "builtin"
>
> That is a bit magic. I first used "GIT_USE_BUILTIN_DIFFTOOL" and it did
> not wor
From: Torsten Bögershausen
Sincec commit 6523728499e7 'convert: unify the "auto" handling of CRLF'
the normalization instruction in Documentation/gitattributes.txt
doesn't work any more.
Update the documentation and add a test case.
Reported by Kristian Adrup
https://github.com/git-for-windows/
Thanks, Jeff.
Ignoring a non-zero exit code from the merge tool, and assuming a
successful merge in that case, seems like the wrong default behavior
to me.
If your merge tool quit with an error, it is more sensible to assume
that the resolution you were working on has not been successfully
conclu
Hallo,
ich biete auf http://www.kreditzentrale.com/thema/online-kredit ein E-Book mit
dem Titel "Kredit" zum kostenlosen Download an. Da ich bei meiner
Themen-Recherche auch Ihre Webseite gefunden habe, dachte ich, das könnte Sie
interessieren.
Wäre es möglich, dass Sie meine Webseite bzw. das
This is the second time i am sending you this mail.
I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for
more details.
Regards.
Friedrich Mayrhofer
Hello Johannes,
On 27 November 2016 at 12:10, Johannes Schindelin
wrote:
> On Fri, 25 Nov 2016, Jakub Narębski wrote:
> > W dniu 24.11.2016 o 21:55, Johannes Schindelin pisze:
[...]
> > > +static int difftool_config(const char *var, const char *value, void *cb)
> > > +{
> > > + if (!strcmp(var
Hi Jakub,
On Fri, 25 Nov 2016, Jakub Narębski wrote:
> W dniu 24.11.2016 o 21:55, Johannes Schindelin pisze:
>
> > The current version of the builtin difftool does not, however, make
> > full use of the internals but instead chooses to spawn a couple of Git
> > processes, still, to make for an e
Dear Concern,
I am Talent Scout For BLUE SKY FILM STUDIO, Present Blue sky Studio a
Film Corporation Located in the United State, is Soliciting for the
Right to use Your Photo/Face and Personality as One of the Semi -Major
Role/ Character in our Upcoming ANIMATED Stereoscope 3D Movie-The Story
of
Hi Peff,
On Sat, 26 Nov 2016, Jeff King wrote:
> On Sat, Nov 26, 2016 at 01:22:28PM +0100, Johannes Schindelin wrote:
>
> > In other words, GIT_CONFIG_PARAMETERS is *explicitly scrubbed* from the
> > environment when we run our tests (by the code block between the "before"
> > and the "after" st
You are a recipient to Mrs Julie Leach Donation of $3 million USD. Contact (
julieleac...@gmail.com ) for claims.
Dear Concern,
I am Talent Scout For BLUE SKY FILM STUDIO, Present Blue sky Studio a
Film Corporation Located in the United State, is Soliciting for the
Right to use Your Photo/Face and Personality as One of the Semi -Major
Role/ Character in our Upcoming ANIMATED Stereoscope 3D Movie-The Story
of
18 matches
Mail list logo
