From a6739aaa1bfeffd5eb23f32b380a41fc94e5a78b Mon Sep 17 00:00:00 2001 From: "Robin P. Clark" Date: Mon, 16 Jul 2012 11:44:39 +0100 Subject: [PATCH] notes on how to use git --- git_notes.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 git_notes.txt diff --git a/git_notes.txt b/git_notes.txt new file mode 100644 index 0000000..6f51169 --- /dev/null +++ b/git_notes.txt @@ -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