stevekm/Git-Diff.md

## example1.txt
Sample1
Sample2
Sample3
Sample4
Sample5

## example2.txt
Sample1
Sample4
Sample6
Sample7
Sample8

## gdiff.sh
#!/bin/bash
#  use git to diff two files or dirs at the per-character level

gdiff () {
    git diff --no-index --word-diff=color --word-diff-regex=. "${1}" "${2}"
}

## Git-Diff.md

      
    Raw
  

              Git-Diff.md
            
          
    A visual example for interpretting the output of git diff, along with a helper alias gdiff to make it easier to git diff two files or directories.
Example input files:
$ cat example1.txt
Sample1
Sample2
Sample3
Sample4
Sample5

$ cat example2.txt
Sample1
Sample4
Sample6
Sample7
Sample8

Diff'ing example1 vs example 2

$ gdiff example1.txt example2.txt


The lines & characters in red are present in example1 but missing in example1


The lines & characters in green are present in example2 but missing in example1


Diff'ing example2 vs. example1

$ gdiff example2.txt example1.txt


The lines & characters in red are present in example2 but missing in example1


The lines & characters in green are present in example1 but missing in example2
	#!/bin/bash
	# use git to diff two files or dirs at the per-character level

	gdiff () {
	git diff --no-index --word-diff=color --word-diff-regex=. "${1}" "${2}"
	}