git-diff

I prefer to use meld as the diff tool. However it doesn't have an option to quickly solve all simple conflicts so in case of merging I'd like to use kdiff3 I've set merge.tool to kdiff3 and diff.guitool to meld but git difftool still always run kdiff3 [merge] tool = kdiff3 conflictstyle = diff3 [diff] guitool = meld renames = copies mnemonicPrefix = true [difftool] prompt = false How to make git difftool run meld ? diff.guitool only applies if you use the --gui flag . Setting diff.tool and merge.tool should make git difftool and git mergetool use different tools: [merge] tool = kdiff3 [diff]

I can compare the tip of master and my working copy with git diff master I can compare the tip of the current branch with its merge base from master with git diff master... Is the a git diff command to compare the merge base of the current branch and the working copy? Is the are git diff command to compare the merge base of the current branch and the working copy? If you current branch is not master, you can try in a bash shell: git diff $(git merge-base --fork-point master) If uses git merge-base with --fork-point : git merge-base --fork-point <ref> [<commit>] Find the point at which a branch

Is there a way to use --word-diff for LaTeX files (*.tex) and keep the standard line difference for other file types? What I want to achieve is to use git diff command and let git show the word difference on *.tex files automatically without a need to write git diff --word-diff each time. At the same time I want git to show the standard line difference for other file types. Is that possible? See the Generating diff text section of the gitattributes documentation . However, to automatically get word diffs just for *.tex files, you must put this together with additional information there and in

In another post I found the very neat git diff --color-words='[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+' which does a great job at compressing git-diff 's output to the essential while remaining legible (especially when adding --word-diff=plain for additional [- / -] and {+ / +} surrounding deletions/additions). While this does include whitespace changes, the output does not highlight them in any noticeable way, e.g. when changing the indentation of a line of python code (which is a severe change) will show up as that line with the longer indentation (before or after), but there is no

I have a branch named 0726b and I want to diff my current working copy with that branch. Apparently there is also a commit that has a hash starting with that very sequence, because I get $ git diff 0726b warning: refname '0726b' is ambiguous. How do I tell git that it should take the argument as a branch name? Try this: git diff refs/heads/0726b refs/heads/0726b specifies a branch named 0726b . The file ./git/refs/heads/0726b contains the commit hash that this branch points to. 来源： https://stackoverflow.com/questions/51534635/how-to-resolve-ambiguity-between-branch-name-and-commit-hash-in-git

git add --patch provides a great interface for reviewing unstaged changes and then staging only the ones that are wanted in the next commit. Great, except for one thing: there is no obvious way to choose which diff view to use. In particular, I would like to be able to configure git add --patch to present diffs to me the same way that git diff --word-diff does. How can I achieve that? (N.B. neither --word-diff nor --word-diff --color is exactly the same as --color-words , and so this question (and its answer ) are different to this question and its answers. However, that question's answers are