26 lines
379 B
Plaintext
26 lines
379 B
Plaintext
|
|
|
|
|
|
|
|
|
|
# SIDE BY SIDE GIT DIFF
|
|
#
|
|
|
|
my_diff.sh
|
|
-----------------------
|
|
kompare "$2" "$5"
|
|
-----------------------
|
|
git config --global diff.external ~/scripts/my_diff.sh
|
|
|
|
useful command:
|
|
|
|
git diff HEAD^ -- papers/fmmd_software_hardware/software_fmmd.tex
|
|
|
|
from: http://stackoverflow.com/questions/7669963/how-can-i-get-a-side-by-side-diff-when-i-do-git-diff
|
|
|
|
|
|
|
|
#
|
|
#
|
|
# NEXT GIT TOP TIP
|