Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:02:04

Jeff King [off-list ref] 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 not working. We can make
this easier by specifying "--cc" as a default ourselves
(which does nothing if no diff format is requested by the
user).
Sigh.

"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 automatically.  And the change this patch introduces will be
broken when we fix "log --cc" ("stash list" will end up always
showing the patch, without a way to disable it).

Can you make this conditional?  Do this only when <options> are
given to "git stash list" command and that includes "-p" or
something?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help