notes on how to use git
This commit is contained in:
parent
0f4b61b18f
commit
a6739aaa1b
25
git_notes.txt
Normal file
25
git_notes.txt
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 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
|
Loading…
Reference in New Issue
Block a user