Re: [PATCH v2 5/6] stash: default listing to "--cc --simplify-combined-diff"

2014-08-12 Thread Keller, Jacob E
On Wed, 2014-07-30 at 20:09 -0400, Jeff King wrote: > On Wed, Jul 30, 2014 at 12:43:09PM -0700, Junio C Hamano wrote: > > > > "git log --cc" is one of the things I wanted for a long time to fix. > > > When the user explicitly asks "--cc", we currently ignore it, but > > > because we know the user

Re: [PATCH v2 5/6] stash: default listing to "--cc --simplify-combined-diff"

2014-07-30 Thread Jeff King
On Wed, Jul 30, 2014 at 12:43:09PM -0700, Junio C Hamano wrote: > > "git log --cc" is one of the things I wanted for a long time to fix. > > When the user explicitly asks "--cc", we currently ignore it, but > > because we know the user wants to view combined diff, we should turn > > "-p" on automa

Re: [PATCH v2 5/6] stash: default listing to "--cc --simplify-combined-diff"

2014-07-30 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> When you list stashes, you can provide arbitrary git-log >> options to change the display. However, adding just "-p" >> does nothing, because each stash is actually a merge commit. >> >> This implementation detail is easy to forget, leading to >> c

Re: [PATCH v2 5/6] stash: default listing to "--cc --simplify-combined-diff"

2014-07-29 Thread Junio C Hamano
Jeff King writes: > When you list stashes, you can provide arbitrary git-log > options to change the display. However, adding just "-p" > does nothing, because each stash is actually a merge commit. > > This implementation detail is easy to forget, leading to > confused users who think "-p" is no

[PATCH v2 5/6] stash: default listing to "--cc --simplify-combined-diff"

2014-07-29 Thread Jeff King
When you list stashes, you can provide arbitrary git-log options to change the display. However, adding just "-p" does nothing, because each stash is actually a merge commit. This implementation detail is easy to forget, leading to confused users who think "-p" is not working. We can make this eas