Magit enables you to “review and commit each of the files separately” directly from the magit-status buffer, without the need for any separate diff buffers. You just expand the file(s) you’re interested in (with TAB, which shows you the diff for the file at point); then you can stage the bits of it that you … Read more
Diff between current file and the index :Gdiff :0 Diff between current file and some other [revision] :Gdiff [revision] Diff between current file and current file 3 commits ago: :Gdiff ~3
Your file is already staged to be committed. You can show it’s diff using the –cached option of git. git diff –cached myfile To unstage it, just do what git status suggests in it’s output 😉 You can check The Git Index For more info.
Note: Git 2.5+ (Q2 2015) will propose a more specific option for whitespace detection. See commits 0e383e1, 0ad782f, and d55ef3e [26 May 2015] by Junio C Hamano (gitster). (Merged by Junio in commit 709cd91, 11 Jun 2015) diff.c: –ws-error-highlight=<kind> option Traditionally, we only cared about whitespace breakages introduced in new lines. Some people want to … Read more
git diff HEAD – Shows what has changed since the last commit. git diff HEAD^ – Shows what has changed since the commit before the latest commit. git diff –cached – Show what has been added to the index via git add but not yet committed. git diff – Show what has changed but hasn’t … Read more
Most probably, the contents of this file haven’t changed, only the executable bit has been cleared. Try actually changing the file by, say, appending an empty line to it, and see what git diff outputs. Apart from file contents, Git also records the state of the executable bit for each file. It makes sense on … Read more
In vboxconnector.php_1, every line is terminated by a CR LF sequence. In vboxconnector.php_2, every line is terminated by just LF. Thus every line of the file has changed. Try using git diff –ignore-space-at-eol. You may also find some useful information in the answers to this question.
The simple way I have seen is this.. Much easy to remember (The text format changes. So you need to know the code change) git diff –color-words Here is a way to make it default If you are using linux add the following command to your ~/.bashrc file Then you can use gitdiff without space … Read more
This functionality is provided through git blame -C <file>. The -C option drives git into trying to find matches between addition or deletion of chunks of text in the file being reviewed and the files modified in the same changesets. Additional -C -C, or -C -C -C extend the search. Try for yourself in a … Read more
As mentioned in the diff man page, a/ and b/ represent the prefix to differentiate source and destination. Actually, you have the options: –no-prefix Do not show any source or destination prefix. –src-prefix=<prefix> Show the given source prefix instead of “a/”. –dst-prefix=<prefix> Show the given destination prefix instead of “b/” Gringo Suave adds in the … Read more