Re: git-apply: warn/fail on *changed* end of line (eol) *only*?

2016-12-25 Thread Junio C Hamano
Igor Djordjevic BugA writes: > In short -- git-apply warns on applying the patch with CRLF line endings > (new), considered whitespace errors, even when previous hunk version > (old) has/had that very same CRLF line endings, too, so nothing actually > changed in this regards. Even worse, it happi

Re: git-apply: warn/fail on *changed* end of line (eol) *only*?

2016-12-25 Thread Igor Djordjevic BugA
On 26/12/2016 00:49, Igor Djordjevic BugA wrote: > This is a follow-up of a message posted at git-users Google group[1], > as the topic may actually be better suited for this mailing list > instead. If needed, some elaboration on the context can be found there, > as well as a detailed example descr

git-apply: warn/fail on *changed* end of line (eol) *only*?

2016-12-25 Thread Igor Djordjevic BugA
Hi to all, This is a follow-up of a message posted at git-users Google group[1], as the topic may actually be better suited for this mailing list instead. If needed, some elaboration on the context can be found there, as well as a detailed example describing the motive for the question itself (or

Re: [PATCH v2] log --graph: customize the graph lines with config log.graphColors

2016-12-25 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Sounds like the good first step should be something like this instead > of jumping straight to generating a new color palette automatically. I like this not merely as a good first step but potentially a good endgame. > diff --git a/graph.c b/graph.c > index d4e

[PATCH] gitk: use right colour for remote refs in the "Tags and heads" dialog

2016-12-25 Thread Paul Wise
Makes it easier to see which refs are local and which refs are remote. Adds consistency with the remote background colour in the graph display. Signed-off-by: Paul Wise --- gitk-git/gitk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gitk-git/gitk b/gitk-git/gitk ind

git blame while resolving merge conflicts

2016-12-25 Thread Salil Surendran
I often rebase a large open source project and there are merge conflicts where I need to figure out who made the change and when it order to decide as to which change to take. So generally what I do is that I go to both repos and look at the file and do a git blame. Is there a mergetool that will p