vimdiff | 易学教程

compare contents of two directories on remote server using unix

阅读更多关于 compare contents of two directories on remote server using unix

I am new to unix and need some help here. I have two directories present on two different server. both the directories contains the same files. Now i want to check if all files are in sync in both the directories. If files are not in sync then i want to display only name of those files. I am able to do it when directories are on same server. not able to figure out how to do this when directories are present on two different servers. eg: server1 /abc/home/sample1/ server2 /abc/home/sample2/ here i want only files name to display when it not in sync. Thanks in advance kielni You can use rsync

Take diff of two vertical opened windows in Vim

阅读更多关于 Take diff of two vertical opened windows in Vim

问题 I've have two files opened. They are opened in vertical mode, next to next. Can I instantly diff these two files without leaving or closing Vim ? 回答1: To begin diffing on all visible windows: :windo diffthis which executes :diffthis on each window. To end diff mode: :diffoff! (The ! makes diffoff apply to all windows of the current tab - it'd be nice if diffthis had the same feature, but it doesn't.) 回答2: in each of the windows you want to diff type: :diffthis If you want to diff all of the

(Vim)diff two subroutines in same file

阅读更多关于 (Vim)diff two subroutines in same file

问题 Is it possible to diff or even vimdiff two almost similar subroutines which occur in the same file? If so, how? I can think of copying the two subroutines in two separate files and then diff them, but is there a way to do it within the original file? Thanks! 回答1: You cannot do this within the original file, but you can do this without using separate files, only separate buffers. This should work if you copied one subroutine in register a (for example, with "ay typed in visual mode) and other

Is there a way to configure vimdiff to ignore ALL whitespaces?

阅读更多关于 Is there a way to configure vimdiff to ignore ALL whitespaces?

问题 I'm using vim -d file1 file2 in order to see the differences between them. This works fine, but I want to ignore whitespace changes - they are irrelevant for source code files. Vim help states that the following command will do the magic: set diffopt+=iwhite But unfortunately, this command only adds -b to diff tool command line, and that only ignores trailing whitespaces. The correct command line key for diff should be -w , to ignore all whitespace changes. But I can't find how to modify the

use vimdiff with a diff file

阅读更多关于 use vimdiff with a diff file

问题 How can I use vimdiff to view the differences described in a diff file? 回答1: Instead of using /usr/bin/vimdiff command, try this: $ vim file :vertical diffpatch path/to/diff ( :vert diffpa for short.) This is equivalent to calling vimdiff on the original file and the subsequently patched file, but vim calls patch on a temporary file for you. Edit If you want vim 's diff-mode to be entered automatically, use this: $ vim file +'vert diffpa path/to/diff' where +command asks vim to execute

Viewing all `git diffs` with vimdiff

阅读更多关于 Viewing all `git diffs` with vimdiff

I setup git diff to wrap into vimdiff, using " Git Diff with Vimdiff " as a guide, and it's working as expected unless there are many files with changes. When there are multiple files with changes and I run git diff , it opens the first file and, after quitting the first instance of vimdiff, I'm presented with the following message: external diff died, stopping at filename This is a completely different behavior than I am used to. I had a similar setup in the past with SVN and, when diffing against multiple files, I would review the first file, then write and quit using :wq and the next file

compare contents of two directories on remote server using unix

阅读更多关于 compare contents of two directories on remote server using unix

问题 I am new to unix and need some help here. I have two directories present on two different server. both the directories contains the same files. Now i want to check if all files are in sync in both the directories. If files are not in sync then i want to display only name of those files. I am able to do it when directories are on same server. not able to figure out how to do this when directories are present on two different servers. eg: server1 /abc/home/sample1/ server2 /abc/home/sample2/

How do you cancel an external git diff?

阅读更多关于 How do you cancel an external git diff?

I've got vim setup as my external diff tool: [diff] external = git_diff_wrapper #!/bin/sh vimdiff "$2" "$5" Say I have 300 files that have been modified; via bash, I type "git diff". It launches 300 vimdiffs sequentially, how do I abort it? If stopping the process is not enough, killing the shell itself (in which you launched the git diff ) might be more effective. See also Git Diff with Vimdiff Not being ready to go full speed into using vimdiff (I’m just new to it), I put the following in ‘ gitvimdiff ’. The result is that I can use vimdiff to look at git-diff by running ‘ gitvimdiff ‘, but

How do you cancel an external git diff?

阅读更多关于 How do you cancel an external git diff?

问题 I've got vim setup as my external diff tool: [diff] external = git_diff_wrapper #!/bin/sh vimdiff "$2" "$5" Say I have 300 files that have been modified; via bash, I type "git diff". It launches 300 vimdiffs sequentially, how do I abort it? 回答1: If stopping the process is not enough, killing the shell itself (in which you launched the git diff ) might be more effective. See also Git Diff with Vimdiff Not being ready to go full speed into using vimdiff (I’m just new to it), I put the following