On Thu, Oct 18, 2012 at 02:58:56PM -0700, Yves S. Garret wrote:
> Yes, but vetoed the idea. For one I'm not a fan of Windows + Git
> "integration". Second of all, I prefer to work from the command line.
Sorry for probably being harsh, but this sounds like a undereducated
religious bullshit. Tw
Yes, but vetoed the idea. For one I'm not a fan of Windows + Git
"integration". Second of all, I prefer to work from the command line.
I'll look into the pre-built libraries tomorrow when I'm at the office,
thanks.
On Wednesday, October 17, 2012 2:53:48 PM UTC-4, Thomas Ferris Nicolaisen
wro
I've read the somewhat sparse documentation in gitattributes(5) on
the "union" merge driver, but on #git I was cautioned that there may
be unexpected behaviors. My use-case is to consolidate (usually[*])
append-only mbox files that might "conflict" when different messages
are added within various
On Wed, Oct 17, 2012 at 12:18:10PM -0700, kramer.newsreader wrote:
> I did a git log and found this merge:
>
> commit 5f052c9b72f5f6306ee3702c66b6de701e36b06f
> Merge: 8100265 f645170
> Author: ...
> Date: Wed Oct 17 12:50:38 2012 -0400
>
> Merge remote-tracking branch 'gerrit/master' into
