Since Git1.6.3, you can use the git difftool script: see my answer below. May be this article will help you. Here are the best parts: There are two different ways to specify an external diff tool. The first is the method you used, by setting the GIT_EXTERNAL_DIFF variable. However, the variable is supposed to point … Read more
Try: diff –brief –recursive dir1/ dir2/ Or alternatively, with the short flags -qr: diff -qr dir1/ dir2/ If you also want to see differences for files that may not exist in either directory: diff –brief –recursive –new-file dir1/ dir2/ # with long options diff -qrN dir1/ dir2/ # with short flag aliases
git diff <local branch> <remote>/<remote branch> For example, git diff main origin/main, or git diff featureA origin/next Of course to have said remote-tracking branch you need to git fetch first; and you need it to have up-to-date information about branches in the remote repository.
To search for commit content (i.e., actual lines of source, as opposed to commit messages and the like), you need to do: git grep <regexp> $(git rev-list –all) git rev-list –all | xargs git grep <expression> will work if you run into an “Argument list too long” error. If you want to limit the search … Read more
To see the diff for a particular COMMIT hash, where COMMIT is the hash of the commit: git diff COMMIT~ COMMIT will show you the difference between that COMMIT‘s ancestor and the COMMIT. See the man pages for git diff for details about the command and gitrevisions about the ~ notation and its friends. Alternatively, … Read more
It should just be: git diff –cached –cached means show the changes in the cache/index (i.e. staged changes) against the current HEAD. –staged is a synonym for –cached. –staged and –cached does not point to HEAD, just difference with respect to HEAD. If you cherry pick what to commit using git add –patch (or git … Read more