On 05/15/2016 09:43 PM, Junio C Hamano wrote:
I think the paragraph is shared among the "diff" family of
commands both plumbing and Porcelain, so I'd say "patches welcome"
at this point ;-).
I think I've done my part here. It's not like this is a feature request.
The script was an
Hi Junio,
On 05/14/2016 09:40 PM, Junio C Hamano wrote:
The variable belongs to UI config, meant for Porcelain "git diff",
together with things like "diff.color", "diff.context", etc.
OK, that makes sense. You might want to fix the man page, though, it
says, like the 'git diff' one, "For
Hi all,
Subj. ...even though it's explicitly mentioned in the subcommand's man
page. Git version 2.7.4 here.
To elaborate:
- Call 'git config --global diff.algorithm histogram'.
- Try the example from http://stackoverflow.com/a/36551123/615245.
'git diff test.css' gives the expected output
On 04/22/2015 12:29 AM, Jeff King wrote:
Hmm, interestingly, if you do _not_ stage the changes (i.e., drop the
final git add there), you get:
$ git stash pop
error: Your local changes to the following files would be overwritten by
merge:
test
Please, commit your changes or
On 04/21/2015 12:11 AM, Junio C Hamano wrote:
But the said file, if it had conflicted, would have had only the
conflicted higher stage entries in the index, no? That is, the
failed merge wouldn't have touched the index for the path if it
already had changes there in the first place.
I'm not
Hi all,
After the user does 'git stash pop', it may result in conflicts.
However, in many cases they may not intend to commit the stashed changes
right away, so staging the applied changes is often not what they intend
to do. However, the conflict is there until you mark it as resolved.
6 matches
Mail list logo
