To simply create a diff patch in git’s diff format from two arbitrary files or directories, without any fancy repository stuff or version control: git diff –no-index some/path other/path > some_filename Jakub Narębski’s comment on knittl’s answer hinted at the answer… For simplicity’s sake, that’s the full command. The > part creates a file and … Read more
The diff-highlight Perl contrib script produces output so similar to that of the Trac screenshots that it is likely that Trac is using it: Install with: wget https://raw.githubusercontent.com/git/git/fd99e2bda0ca6a361ef03c04d6d7fdc7a9c40b78/contrib/diff-highlight/diff-highlight && chmod +x diff-highlight Move the file diff-highlight to the ~/bin/ directory (or wherever your $PATH is), and then add the following to your ~/.gitconfig: [pager] diff … Read more
Git has a word diff, and defining all characters as words effectively gives you a character diff. However, newline changes are ignored. Example Create a repository like this: mkdir chardifftest cd chardifftest git init echo -e ‘foobarbaz\ncatdog\nfox’ > file git add -A; git commit -m 1 echo -e ‘fuobArbas\ncat\ndogfox’ > file git add -A; git … Read more
Apply Patch With TortoiseMerge: Find and open an existing SVN repo directory Create a new directory named “merges”, if it does not exist already Copy the file onto which you want to apply the .patch file ADD and COMMIT to the svn repository before you continue to the next step Right click on merges and … Read more
For me, it had something to do with file permissions. Someone with Mac/Linux on my project seems to commit some files with non-default permissions which my Windows Git client failed to reproduce. The solution for me was to tell Git to ignore file permissions: git config core.fileMode false Other insight: How do I make Git … Read more
git diff > patchfile and patch -p1 < patchfile work but as many people noticed in comments and other answers patch does not understand adds, deletes and renames. There is no option but git apply patchfile if you need handle file adds, deletes and renames. EDIT December 2015 Latest versions of patch command (2.7, released … Read more
Omg, drivers and awk to exclude a lousy file? Since Git 1.9 something you can: git diff — . ‘:(exclude)db/irrelevant.php’ ‘:(exclude)db/irrelevant2.php’ (On Windows, replace the single quotes ‘ by double quotes “.) Ah, elegance! See the quoted answer and for details this answer by @torek.
Here is a magic chant to list functions within a git diff * git diff | \ grep -E ‘^(@@)’ | \ grep “(” | \ sed ‘s/@@.*@@//’ | \ sed ‘s/(.*//’ | \ awk -F ” ” ‘{print $NF}’ | \ uniq …and what it does is… Picks the current diff, next picks only … Read more
$ git diff –help -G<regex> Look for differences whose added or removed line matches the given <regex>. EDIT: After some tests I’ve got something like git diff -b -w –word-diff-regex=’.*\[[^”]*\]’ Then I’ve got output like: diff –git a/test.php b/test.php index 62a2de0..b76891f 100644 — a/test.php +++ b/test.php @@ -1,3 +1,5 @@ <?php {+$my_array[my_key]+} = “test”; ?> … Read more
// Make hashtable of ids in B var bIds = {} b.forEach(function(obj){ bIds[obj.id] = obj; }); // Return all elements in A, unless in B return a.filter(function(obj){ return !(obj.id in bIds); }); very minor addendum: If the lists are very large and you wish to avoid the factor of 2 extra memory, you could store … Read more