Re: [RFC/PATCH 3/2] stash: show combined diff with stash show
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 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. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC/PATCH 3/2] stash: show combined diff with stash show
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 ignoring is absolutely the right thing ;-) Unlike stash pop, which is try to bring me back to exactly the same state, it is a strong indication that the user wants to further tweak the previous work to grab a patch and apply to the working tree---and while you are working inside the working tree, you haven't started adding the index contents, so git diff after such an operation should show what you grabbed out of the stash, applied to the working tree, relative to what you had in the index. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC/PATCH 3/2] stash: show combined diff with stash show
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 message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
