diff

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

I've had a look at all similar questions however I've double checked and something strange is definitely happening. On one server (Solaris with git 1.8.1) I cloned the git repository then copied the .git folder into my existing live files. This worked perfectly, I could run git status then git diff [filename] to check any files that were different. On another server (Solaris with git 1.7.6) I'm doing exactly the same however git diff [filename] shows nothing, even if the contents of the file is definitely different. I have also tested adding a new file, committing it then editing. Same issue,

I configured git like this: git config --global diff.tool meld When I run: git difftool I get the following message: Viewing: 'hello.txt' Hit return to launch 'meld': Then, if I press Enter , meld will launch. How can I disable this message, so that meld will be launched straight away after typing git difftool ? man git-difftool OPTIONS -y, --no-prompt Do not prompt before launching a diff tool. ZJR There's also an option: difftool.prompt Prompt before each invocation of the diff tool. The following command turns off the prompt globally (for all repos): git config --global difftool.prompt

What is the easiest way (using a graphical tool or command line on Ubuntu Linux) to know if two binary files are the same or not (except for the time stamps)? I do not need to actually extract the difference. I just need to know whether they are the same or not. Joe The standard unix diff will show if the files are the same or not: [me@host ~]$ diff 1.bin 2.bin Binary files 1.bin and 2.bin differ If there is no output from the command, it means that the files have no differences. bobjandal Use cmp command. This will either exit cleanly if they are binary equal, or it will print out where the

I use Vim. I open a file. I edit it and I want to see what I've edited before I save it. How can I do this in Vim? Bill Lynch http://vim.wikia.com/wiki/Diff_current_buffer_and_the_original_file Here is a function and command to see a diff between the currently edited file and its unmodified version in the filesystem. Just put this in your vimrc or in the plugin directory, open a file, make some modifications without saving them, and do :DiffSaved . function! s:DiffWithSaved() let filetype=&ft diffthis vnew | r # | normal! 1Gdd diffthis exe "setlocal bt=nofile bh=wipe nobl noswf ro ft=" .

This answer is great for seeing a visual diff between two files that are checked into git: How do I view 'git diff' output with a visual diff program? However, I'd like to see a visual diff between two branches. So far, my best bet seems to be: git diff --name-status master dev which isn't very informative and not very visual. Is there anything better out there? alex Use git diff with a range . git diff branch1..branch2 This will compare the tips of each branch. If you really want some GUI software, you can try something like SourceTree which supports Mac OS X and Windows. Tormod Hystad To see

I have two directories with the same list of files. I need to compare all the files present in both the directories using the diff command. Is there a simple command line option to do it, or do I have to write a shell script to get the file listing and then iterate through them? You can use the diff command for that: diff -bur folder1/ folder2/ This will output a recursive diff that ignore spaces, with a unified context: b flag means ignoring whitespace u flag means a unified context (3 lines before and after) r flag means recursive Suresh If you are only interested to see the files that