3 ms·
> many programmers are in the habit of reviewing their changes before committing. Does GIT let you easily tease out these differences? I'm unsure what you're a
by pyre 17y ago
> many programmers are in the habit of reviewing their changes before committing. Does GIT let you easily tease out these differences?
I'm unsure what you're asking here. I can say that 'git diff' shows you the difference between the working tree and the index and 'git diff --cached' shows you the difference between the index and the most recent commit (i.e. HEAD). Both of those accept a filename as an argument to just git the diff of that file in the respective spaces. All of the changes that cleanly merged are in the index, and all of the unresolved conflicts are not when you first enter the 'unresolved conflicts' state while attempting a merge.
If your asking something more specific than that you'll have to rephrase or explain for me.