Lets take a look at example advanced diff from git history (in commit 1088261f in git.git repository): diff –git a/builtin-http-fetch.c b/http-fetch.c similarity index 95% rename from builtin-http-fetch.c rename to http-fetch.c index f3e63d7..e8f44ba 100644 — a/builtin-http-fetch.c +++ b/http-fetch.c @@ -1,8 +1,9 @@ #include “cache.h” #include “walker.h” -int cmd_http_fetch(int argc, const char **argv, const char *prefix) +int … Read more
echo ${Array1[@]} ${Array2[@]} | tr ‘ ‘ ‘\n’ | sort | uniq -u Output key10 key7 key8 key9 You can add sorting if you need
The comm command (short for “common”) may be useful comm – compare two sorted files line by line #find lines only in file1 comm -23 file1 file2 #find lines only in file2 comm -13 file1 file2 #find lines common to both files comm -12 file1 file2 The man file is actually quite readable for this.
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.
If the files are sorted (they are in your example): comm -23 file1 file2 -23 suppresses the lines that are in both files, or only in file 2. If the files are not sorted, pipe them through sort first… See the man page here
Since I’d already created these images, I thought it might be worth using them in another answer, although the description of the difference between .. (dot-dot) and … (dot-dot-dot) is essentially the same as in manojlds’s answer. The command git diff typically¹ only shows you the difference between the states of the tree between exactly … Read more
Just wrote a class to compute smallest (not to be taken literally) number of edits to transform one string into another string: http://www.raymondhill.net/finediff/ It has a static function to render a HTML version of the diff. It’s a first version, and likely to be improved, but it works just fine as of now, so I … Read more
If you’re working with small databases I’ve found running mysqldump on both databases with the –skip-comments and –skip-extended-insert options to generate SQL scripts, then running diff on the SQL scripts works pretty well. By skipping comments you avoid meaningless differences such as the time you ran the mysqldump command. By using the –skip-extended-insert command you … Read more
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
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