Re: [RFC/PATCH 3/2] stash: show combined diff with stash show

2014-07-30 Thread Jeff King
On Tue, Jul 29, 2014 at 11:13:37AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... People might be doing things like git stash show | git apply, and would want to ignore the index content ... FWIW, that is exactly how I use git stash show -p most of the time. Like I

Re: [RFC/PATCH 3/2] stash: show combined diff with stash show

2014-07-30 Thread Junio C Hamano
On Wed, Jul 30, 2014 at 5:17 PM, Jeff King p...@peff.net wrote: Like I said, I'm iffy on this part of the series for that reason. But I'm curious: what do you think should happen in such a use case when there are staged contents in the index? Right now we completely ignore them. I think

[RFC/PATCH 3/2] stash: show combined diff with stash show

2014-07-29 Thread Jeff King
A stash may store not only working tree changes, but also changes to the index. However, git stash show will only ever show the working tree changes. We can instead show both as a combined diff, but use --simplify-combined-diff so that we show a normal pairwise diff in the common case that there

Re: [RFC/PATCH 3/2] stash: show combined diff with stash show

2014-07-29 Thread Junio C Hamano
Jeff King p...@peff.net writes: ... People might be doing things like git stash show | git apply, and would want to ignore the index content ... FWIW, that is exactly how I use git stash show -p most of the time. -- To unsubscribe from this list: send the line unsubscribe git in the body of a