diff options
| author | Franck Cuny <franck.cuny@gmail.com> | 2016-08-10 14:33:04 -0700 |
|---|---|---|
| committer | Franck Cuny <franck.cuny@gmail.com> | 2016-08-10 20:17:56 -0700 |
| commit | 8d7d02f42c3947f756c18cb4d37d9d97fbd0d27d (patch) | |
| tree | a6cecddaaea7e87d901a6c28bebe3a531438f24b /posts/2008-12-05-vim-and-git.org | |
| parent | Merge branch 'convert-to-org' (diff) | |
| download | lumberjaph-8d7d02f42c3947f756c18cb4d37d9d97fbd0d27d.tar.gz | |
convert back to md
Diffstat (limited to 'posts/2008-12-05-vim-and-git.org')
| -rw-r--r-- | posts/2008-12-05-vim-and-git.org | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/posts/2008-12-05-vim-and-git.org b/posts/2008-12-05-vim-and-git.org deleted file mode 100644 index 3367bce..0000000 --- a/posts/2008-12-05-vim-and-git.org +++ /dev/null @@ -1,42 +0,0 @@ -idea from -[[http://use.perl.org/use.perl.org/_Ovid/journal/37966.html][Ovid's -journal]] (ovid is full of really good ideas for vim): - -to get a quick git diff in my vim session, put this in your .vimrc - -#+BEGIN_EXAMPLE - 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 -#+END_EXAMPLE - -the output looks like this: - -#+BEGIN_EXAMPLE - 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 -#+END_EXAMPLE - -You choose the revision you want to check the diff against, and you got -a (colorless) diff in your vim buffer. |
