summaryrefslogtreecommitdiff
path: root/posts/2008-12-05-vim-and-git.md
diff options
context:
space:
mode:
authorFranck Cuny <franck.cuny@gmail.com>2016-08-10 14:33:04 -0700
committerFranck Cuny <franck.cuny@gmail.com>2016-08-10 20:17:56 -0700
commit8d7d02f42c3947f756c18cb4d37d9d97fbd0d27d (patch)
treea6cecddaaea7e87d901a6c28bebe3a531438f24b /posts/2008-12-05-vim-and-git.md
parentMerge branch 'convert-to-org' (diff)
downloadlumberjaph-8d7d02f42c3947f756c18cb4d37d9d97fbd0d27d.tar.gz
convert back to md
Diffstat (limited to '')
-rw-r--r--posts/2008-12-05-vim-and-git.md39
1 files changed, 39 insertions, 0 deletions
diff --git a/posts/2008-12-05-vim-and-git.md b/posts/2008-12-05-vim-and-git.md
new file mode 100644
index 0000000..a72281c
--- /dev/null
+++ b/posts/2008-12-05-vim-and-git.md
@@ -0,0 +1,39 @@
+idea from [Ovid's journal](http://use.perl.org/use.perl.org/_Ovid/journal/37966.html) (ovid is full of really good ideas for vim):
+
+to get a quick git diff in my vim session, put this in your .vimrc
+
+``` viml
+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
+```
+
+the output looks like this:
+
+```
+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.