diff options
| author | Franck Cuny <franckcuny@gmail.com> | 2016-08-04 11:12:37 -0700 |
|---|---|---|
| committer | Franck Cuny <franckcuny@gmail.com> | 2016-08-04 11:12:37 -0700 |
| commit | 2d2a43f200b88627253f2906fbae87cef7c1e8ce (patch) | |
| tree | c65377350d12bd1e62e0bdd58458c1044541c27b /posts/2008-12-05-vim-and-git.md | |
| parent | Use Bullet list for the index. (diff) | |
| download | lumberjaph-2d2a43f200b88627253f2906fbae87cef7c1e8ce.tar.gz | |
Mass convert all posts from markdown to org.
Diffstat (limited to '')
| -rw-r--r-- | posts/2008-12-05-vim-and-git.md | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/posts/2008-12-05-vim-and-git.md b/posts/2008-12-05-vim-and-git.md deleted file mode 100644 index 0a4146b..0000000 --- a/posts/2008-12-05-vim-and-git.md +++ /dev/null @@ -1,37 +0,0 @@ -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 - -```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 -``` - -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. |
