Jeff King writes:
> Hmph. To be honest, I am starting to wonder if implying "--first-parent"
> is a more sensible option for "stash list". It matches "stash show", at
> least, and it is not unreasonable to simply present the changes in the
> working tree by default, and ignore the index. People w
On Tue, Jul 29, 2014 at 11:23:16AM -0700, Junio C Hamano wrote:
> I see you added --simplify-combined-diffs to avoid breaking "log",
> so that is not too bad, but I am still unsure what should happen
> when the first parent and the result is the same and only the second
> parent is different (i.e.
On Tue, Jul 29, 2014 at 12:27:07PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > I think that is my point, though. The user is _not_ aware that the
> > commit in question is a merge. They stashed some stuff, and now they
> > want to see the result. I'd like to show them a vanilla commit
Jeff King writes:
> I think that is my point, though. The user is _not_ aware that the
> commit in question is a merge. They stashed some stuff, and now they
> want to see the result. I'd like to show them a vanilla commit if the
> index is irrelevant, and otherwise show them something more inter
Jeff King writes:
> On Tue, Jul 29, 2014 at 10:00:22AM -0700, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > So perhaps we could do something better on the viewing side, and
>> > "simplify" combined merges for files with all-identical parents.
>>
>> Or you can ask to show the difference
On Tue, Jul 29, 2014 at 10:00:22AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > So perhaps we could do something better on the viewing side, and
> > "simplify" combined merges for files with all-identical parents.
>
> Or you can ask to show the difference with the first parent, no?
Y
Jeff King writes:
> So perhaps we could do something better on the viewing side, and
> "simplify" combined merges for files with all-identical parents.
Or you can ask to show the difference with the first parent, no?
I do not think giving a single-parent diff when --cc/-c is asked
for, which is
On Tue, Jul 29, 2014 at 02:59:40AM +, brian m. carlson wrote:
> On Mon, Jul 28, 2014 at 05:56:28PM -0700, Michael Migdol wrote:
> > Sorry for error -- I meant: git stash list -p, not git stash -p.
> >
> > On Mon, Jul 28, 2014 at 5:38 PM, Michael Migdol
> > wrote:
> > > I recently upgraded f
brian m. carlson crustytoothpaste.net> writes:
>
> On Mon, Jul 28, 2014 at 05:56:28PM -0700, Michael Migdol wrote:
> > Sorry for error -- I meant: git stash list -p, not git stash -p.
> >
> > On Mon, Jul 28, 2014 at 5:38 PM, Michael Migdol
migdol.net> wrote:
> > > I recently upgraded from Ubun
On Mon, Jul 28, 2014 at 05:56:28PM -0700, Michael Migdol wrote:
> Sorry for error -- I meant: git stash list -p, not git stash -p.
>
> On Mon, Jul 28, 2014 at 5:38 PM, Michael Migdol
> wrote:
> > I recently upgraded from Ubuntu 13.10 to Ubuntu 14.04. After doing so,
> > "git stash -p" stopped w
Sorry for error -- I meant: git stash list -p, not git stash -p.
On Mon, Jul 28, 2014 at 5:38 PM, Michael Migdol wrote:
> I recently upgraded from Ubuntu 13.10 to Ubuntu 14.04. After doing so,
> "git stash -p" stopped working. (It apparently is ignoring the -p
> parameter). I'm not sure what v
I recently upgraded from Ubuntu 13.10 to Ubuntu 14.04. After doing so,
"git stash -p" stopped working. (It apparently is ignoring the -p
parameter). I'm not sure what version I was using previously, but after
some experimentation, I see that:
version 1.7.12.2 : stash -p DOES work
version 1.9.3
12 matches
Mail list logo
