diff options
| author | Franck Cuny <franck.cuny@gmail.com> | 2013-11-26 10:36:10 -0800 |
|---|---|---|
| committer | Franck Cuny <franck.cuny@gmail.com> | 2013-11-26 10:36:10 -0800 |
| commit | 8ddf2e94df70707b458528a437759b96046d3e01 (patch) | |
| tree | d442818d92d3c9c6f7fcdc92857a1228963849a1 /_posts/2008-12-05-vim-and-git.textile | |
| parent | Don't need to use the IP in the makefile. (diff) | |
| download | lumberjaph-8ddf2e94df70707b458528a437759b96046d3e01.tar.gz | |
Huge update.
Moved all posts from textile to markdown. Updated all the CSS and
styles. Added a new page for the resume.
Diffstat (limited to '_posts/2008-12-05-vim-and-git.textile')
| -rw-r--r-- | _posts/2008-12-05-vim-and-git.textile | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/_posts/2008-12-05-vim-and-git.textile b/_posts/2008-12-05-vim-and-git.textile deleted file mode 100644 index 1a137b6..0000000 --- a/_posts/2008-12-05-vim-and-git.textile +++ /dev/null @@ -1,45 +0,0 @@ ---- -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. - - |