vimdiff between current and previous git version of a file

Question

Is there a way of using vimdiff to compare the current version of a file and the same file n git versions ago?

For example, I'm working on the file foo.c on the branch master. I'd like to do a vimdiff between foo.c and foo.c from master~10, to copy one or two lines across from the old version.

PS I'm aware of git cherry pick, but that's for whole files, not just a couple of lines.

score 19 · Answer 1 · answered Feb 28 '13 at 06:26

Duh! RTFM. I was adding a PPS about this not being a use case for git difftool, then started wondering "what exactly does git difftool do...".

Solution is:

git difftool master master~10 -- foo.c

That is, presuming difftool is already set up correctly in ~/.gitconfig:

[diff]
  tool = vimdiff
[difftool]
  prompt = false

score 11 · Answer 2 · answered Feb 28 '13 at 08:16

11

For working with Git under Vim, the fugitive.vim - A Git wrapper so awesome, it should be illegal plugin is very useful. Check it out!

The vimdiff can be made with :Gdiff [revision].

answered Feb 28 '13 at 08:16

Ingo Karkat

167,457
16
250
324

score 8 · Answer 3 · answered Apr 29 '17 at 11:07

8

A solution that works without overriding the git config would be

vimdiff file.tex <( git show master~2:file.tex )

answered Apr 29 '17 at 11:07

Aaron

321
4
9

score 3 · Answer 4 · edited Dec 17 '18 at 22:43

3

Possible duplicate of Viewing all `git diffs` with vimdiff

edited Dec 17 '18 at 22:43

mosh

1,402
15
16

answered Feb 28 '13 at 06:29

Trevor Norris

20,499
4
26
28

Wow Trev, you're quick off the mark. How is it you saw this question so fast, have you got a bot running?!?! – Sonia Hamilton Feb 28 '13 at 06:30

vimdiff between current and previous git version of a file

4 Answers4