On Thu, Feb 2, 2017 at 6:05 PM, Junio C Hamano wrote:
> * "git pull --rebase", when there is no new commits on our side since
>we forked from the upstream, should be able to fast-forward without
>invoking "git rebase", but it didn't.
As someone who has to mentor new developers to Git at
- Original Message -
> From: "Spencer Graves"
> Sent: Friday, October 2, 2015 2:50:30 AM
> Subject: can't install on OS X
>
> I downloaded "git-2.5.3-intel-universal-mavericks.dmg" per
> instructions. When I tried to install it, I first had trouble because
> it wasn't from the Mac App Sto
- Original Message -
> From: "Jeff King"
> Sent: Thursday, November 14, 2013 3:14:56 AM
> Subject: Re: can we prevent reflog deletion when branch is deleted?
>
> On Thu, Nov 14, 2013 at 05:48:50AM +0530, Sitaram Chamarty wrote:
>
> > Is there *any* way we can preserve a reflog for a dele
- Original Message -
> From: "Jeff King"
> To: "Stephen Bash"
> Cc: git@vger.kernel.org, "Tony Finch"
> Sent: Friday, October 11, 2013 11:16:14 AM
> Subject: Re: A workflow for local patch maintenance
>
> On Fri, Oct 11, 2013 a
- Original Message -
> From: "Jeff King"
> Sent: Thursday, October 10, 2013 1:36:28 PM
> Subject: Re: A workflow for local patch maintenance
>
> ... snip ...
>
> That being said, there are some new downsides, as you noted:
>
> 1. Resolving conflicts between your version and the reworke
- Original Message -
> From: "Thomas Rast"
> Sent: Thursday, May 23, 2013 6:56:50 PM
> Subject: Re: git stash deletes/drops changes of
>
> Junio C Hamano writes:
>
> > Thomas Rast writes:
> >
> > > So maybe it would be time to first make up our minds as to what
> > > --assume-unchanged
Hi all-
I have a branch history that looks like this:
--M-M-- master
\ / /
x feature
\ \
x-A- maint
In other words we had a new feature that was "so cool" that after testing on
master was back-ported to maint (luckily
- Original Message -
> From: "Piotr Krukowiecki"
> Sent: Wednesday, December 5, 2012 5:19:44 PM
> Subject: Re: git-svn with non-standard repository layout
>
> Do you mean something like
>
>branches = branches/work/*/*:refs/remotes/work/*
>branches = branches/{branch1,branch2}:ref
- Original Message -
> From: "Piotr Krukowiecki"
> Sent: Wednesday, December 5, 2012 11:26:54 AM
> Subject: Re: git-svn with non-standard repository layout
>
> On Tue, Dec 4, 2012 at 10:19 PM, Carsten Fuchs
> wrote:
> > Hi Piotr,
> >
> > Am 2012-12-04 18:29, schrieb Piotr Krukowiecki:
>
- Original Message -
> From: "Felipe Contreras"
> Sent: Tuesday, December 4, 2012 9:19:18 AM
> Subject: Re: Python extension commands in git - request for policy change
>
> > > Also, you are ignoring all the advantages that shell has and
> > > python does not.
> >
> > Out of curiosity, ca
- Original Message -
> From: "Jason J CTR Pyeron (US)"
> Sent: Monday, November 26, 2012 4:06:59 PM
> Subject: RE: git bundle format [OT]
>
> > First, a shot out of left field: how about a patch based workflow?
> > (similar to the mailing list, just replace email with sneakernet)
> > Patc
- Original Message -
> From: "Jason J CTR Pyeron (US)"
> Sent: Monday, November 26, 2012 2:24:54 PM
> Subject: git bundle format
>
> I am facing a situation where I would like to use git bundle but at
> the same time inspect the contents to prevent a spillage[1].
As someone who faced a s
- Original Message -
> From: "Tim Janik"
> Sent: Friday, November 2, 2012 9:24:29 AM
> Subject: Re: Overlong lines with git-merge --log
>
> On 02.11.2012 11:05, Jeff King wrote:
>
> > Taking just the first line of those often cuts off the useful part.
> > It was deemed less bad to show t
- Original Message -
> From: "Jonathan Nieder"
> Sent: Thursday, October 4, 2012 4:30:01 AM
> Subject: Re: fa/remote-svn (Re: What's cooking in git.git (Oct 2012, #01;
> Tue, 2))
>
> > > * fa/remote-svn (2012-09-19) 16 commits
> > > - Add a test script for remote-svn
> > > - remote-svn:
- Original Message -
> From: "Nguyen Thai Ngoc Duy"
> Sent: Tuesday, September 25, 2012 7:22:49 AM
> Subject: Re: [RFC/PATCH 0/3] git log --pretty=lua
>
> On Tue, Sep 25, 2012 at 7:23 AM, Jeff King wrote:
> > We've talked off and on about extending the --pretty=format
> > specifiers to s
- Original Message -
> From: "Junio C Hamano"
> Sent: Wednesday, September 12, 2012 1:01:30 PM
> Subject: Re: [PATCH 2/2] attr: "binary" attribute should choose built-in
> "binary" merge driver
>
> >> Perhaps something like this makes it better.
> >
> > Patch didn't apply on top of the p
- Original Message -
> From: "Junio C Hamano"
> Sent: Wednesday, September 12, 2012 4:55:53 AM
> Subject: Re: [PATCH 2/2] attr: "binary" attribute should choose built-in
> "binary" merge driver
>
> Jeff King writes:
>
> > On Sat, Sep 08, 2012 at 09:40:39PM -0700, Junio C Hamano wrote:
- Original Message -
> From: "Junio C Hamano"
> Sent: Sunday, September 9, 2012 12:40:37 AM
> Subject: [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver
>
> The part that grants Stephen's wish is unchanged from the earlier
> "perhaps like this" patch, but this time with a bit
Hi all-
Helping a coworker resolve merge conflicts today I found I wanted a -Xtheirs
that completely replaces conflicted binary files with the copy from the
incoming branch. In other words rather than doing
$ git merge maint
... conflicts occur ...
$ git checkout --theirs -- path/to/bina
- Original Message -
> From: "Matthew Caron"
> Sent: Tuesday, August 28, 2012 1:41:51 PM
> Subject: Re: diff/merge tool that ignores whitespace changes
>
> > > I'm looking for a diff / merge tool that treats lines with only
> > > whitespace changes (trailing or leading whitespaces, linef
- Original Message -
> From: "Enrico Weigelt"
> Sent: Tuesday, August 28, 2012 12:26:39 PM
> Subject: diff/merge tool that ignores whitespace changes
>
> I'm looking for a diff / merge tool that treats lines with
> only whitespace changes (trailing or leading whitespaces,
> linefeeds, etc
- Original Message -
> From: "Junio C Hamano"
> Sent: Friday, August 17, 2012 5:10:47 PM
> Subject: Re: "Temporary merge branch 2" Conflicts
>
> Stephen Bash writes:
>
> > What is the recommended method for resolving this sort of merge?
- Original Message -
> From: "Stephen Bash"
> Sent: Friday, August 17, 2012 9:48:45 AM
> Subject: "Temporary merge branch 2" Conflicts
>
> Given this branch history:
>
> -M--M---M---> dev
> \ /
Hi all-
Given this branch history:
-M--M---M---> dev
\ / / /
-- v1-maint
\ \ \
M---M---> v1.5-maint
I am attempting to merge v1.5-maint into dev. There are some expected
conflicts, but when I start
- Original Message -
> From: "Junio C Hamano"
> To: "Dmitry Ivankov"
> Cc: git@vger.kernel.org
> Sent: Wednesday, July 11, 2012 1:00:29 PM
> Subject: Re: [PATCH 2/4] Allow reading svn dumps from files via file:// urls.
>
> Dmitry Ivankov writes:
>
> > Florian Achleitner gmail.com>
> >
25 matches
Mail list logo
