From 0afbfaee75e8480e8e0ed0a3bbd3749a4756f727 Mon Sep 17 00:00:00 2001
From: franck cuny <franck@lumberjaph.net>
Date: Fri, 10 Sep 2010 23:25:10 +0200
Subject: initial import

---
 _posts/2008-12-05-vim-and-git.textile | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 _posts/2008-12-05-vim-and-git.textile

(limited to '_posts/2008-12-05-vim-and-git.textile')

diff --git a/_posts/2008-12-05-vim-and-git.textile b/_posts/2008-12-05-vim-and-git.textile
new file mode 100644
index 0000000..1a137b6
--- /dev/null
+++ b/_posts/2008-12-05-vim-and-git.textile
@@ -0,0 +1,45 @@
+---
+layout: post
+category: app
+title: vim and git
+---
+
+idea from "Ovid's journal":http://use.perl.org/~Ovid/journal/37966 (ovid is full of really good ideas for vim):
+
+to get a quick git diff in my vim session, put this in your .vimrc
+
+{% highlight vim %}
+map ,gh   :call SourceDiff() " gh for git history
+
+function! SourceDiff()
+    let filename = bufname("%")
+    let command = 'git log -5 --pretty=format:"%h - (%ar) %an - %s" "'.filename.'"'
+    let result   = split( system(command), "\n" )
+
+    if empty(result)
+    echomsg("No past revisions for " . filename)
+    return
+    endif
+
+    " get the list of files
+    let revision = PickFromList('revision', result)
+
+    if strlen(revision)
+        let items = split(revision, " ")
+        execute '!git diff ' . items[0] . ' -- "' . filename .'" | less'
+    endif
+endfunction
+{% endhighlight %}
+
+the output will look like
+
+bc. Choose a revision:
+1: ea0bb4d - (3 days ago) franck cuny - fix new_freq
+2: a896ac7 - (5 weeks ago) franck cuny - fix typo
+3: c9bc5fd - (5 weeks ago) franck cuny - update test
+4: e9de4be - (5 weeks ago) franck cuny - change the way we rewrite and check an existing url
+5: 3df1fd6 - (7 weeks ago) franck cuny - put id category
+
+You choose the revision you want to check the diff against, and you got a (colorless) diff in your vim buffer.
+
+
-- 
cgit v1.2.3

