.procmailrc and uudeview (put attachments from diff senders to diff folders) Post: 302508040

10 More Discussions You Might Find Interesting

1. Shell Programming and Scripting

diff 2 files; output diff's to 3rd file

Hello, I want to compare two files. All records in file 2 that are not in file 1 should be output to file 3. For example: file 1 123 1234 123456 file 2 123 2345 23456 file 3 should have 2345 23456 I have looked at diff, bdiff, cmp, comm, diff3 without any luck!

2. UNIX for Advanced & Expert Users

Script to Find Diff from two folders

Hi I would like to find the diff between two folders: Ex: Folder:1 html.java go.java ten.java Folder:2html.java go.java ten.java you.java Questions comes: Folder:1 contains a files with old version, know the files were modified and updated with the new version in Folder2. I...

3. UNIX for Dummies Questions & Answers

diff

hi all, i want to do this shell script. create a script that will check the transferred file vs. orig file. 1. diff the file1 and file2 2. if difference found, retain the original file and email to netcracker team. 3. if no difference found, delete the previous file and retain...

4. Shell Programming and Scripting

Simulate SVN diff using plain diff

Hi, svn diff does not work very well with 2 local folders, so I am trying to do this diff using diff locally. since there's a bunch of meta files in an svn directory, I want to do a diff that excludes everything EXCEPT *.java files. there seems to be only an --exclude option, so I'm not sure...

5. UNIX for Dummies Questions & Answers

Using diff

is there any way to make the diff function compare 1 folder to another instead of just file to file? also, can binary files be compared?

6. Shell Programming and Scripting

Awk - Count instances of a number in col1 and put results in a col2 (new) of diff file

I have 2 files as follows: filename1: : 6742 /welcome/mundial98_ahf1_404.htm 1020 6743 /welcome/mundial98_ahf1_404.htm 2224 6744 /welcome/mundial_ef1_404.htm 21678 6745 /welcome/mundial_if_404.htm 4236 6746 /welcome/mundial_lf1_404.htm 21678 filename2: 6746 894694763 1...

7. UNIX for Dummies Questions & Answers

Diff between more and less

Hi, Can anyone tell me the diff between the two filters "more" and "less"? Many thanks. Regards, Venkat.

8. Shell Programming and Scripting

serach diff filename in diff location using shell scripting

Hi, I am new to shell scripting. please help me to find out the solution. I need a script where we need to read the text file(consists of all file names) and get the file names one by one and append the date suffix for each file name as 'yyyymmdd' . Then search each file if exists...

9. Shell Programming and Scripting

Compare two CSV files and put the difference in third file with line no,field no and diff value.

I am having two csv files i need to compare these files and the output file should have the information of the differences at the field level. For Example, File 1: A,B,C,D,E,F 1,2,3,4,5,6 File 2: A,C,B,D,E,F 1,2,4,5,5,6 out put file:

10. Shell Programming and Scripting

Diff 3 files, but diff only their 2nd column

Guys i have 3 files, but i want to compare and diff only the 2nd column path=`/home/whois/doms` for i in `cat domain.tx` do whois $i| sed -n '/Registry Registrant ID:/,/Registrant Email:/p' > $path/$i.registrant whois $i| sed -n '/Registry Admin ID:/,/Admin Email:/p' > $path/$i.admin...

LEARN ABOUT LINUX

git-cherry

GIT-CHERRY(1)							    Git Manual							     GIT-CHERRY(1)

NAME

       git-cherry - Find commits yet to be applied to upstream

SYNOPSIS

       git cherry [-v] [<upstream> [<head> [<limit>]]]

DESCRIPTION

       Determine whether there are commits in <head>..<upstream> that are equivalent to those in the range <limit>..<head>.

       The equivalence test is based on the diff, after removing whitespace and line numbers. git-cherry therefore detects when commits have been
       "copied" by means of git-cherry-pick(1), git-am(1) or git-rebase(1).

       Outputs the SHA1 of every commit in <limit>..<head>, prefixed with - for commits that have an equivalent in <upstream>, and + for commits
       that do not.

OPTIONS

       -v
	   Show the commit subjects next to the SHA1s.

       <upstream>
	   Upstream branch to search for equivalent commits. Defaults to the upstream branch of HEAD.

       <head>
	   Working branch; defaults to HEAD.

       <limit>
	   Do not report commits up to (and including) limit.

EXAMPLES

   Patch workflows
       git-cherry is frequently used in patch-based workflows (see gitworkflows(7)) to determine if a series of patches has been applied by the
       upstream maintainer. In such a workflow you might create and send a topic branch like this:

	   $ git checkout -b topic origin/master
	   # work and create some commits
	   $ git format-patch origin/master
	   $ git send-email ... 00*

       Later, you can see whether your changes have been applied by saying (still on topic):

	   $ git fetch	# update your notion of origin/master
	   $ git cherry -v

   Concrete example
       In a situation where topic consisted of three commits, and the maintainer applied two of them, the situation might look like:

	   $ git log --graph --oneline --decorate --boundary origin/master...topic
	   * 7654321 (origin/master) upstream tip commit
	   [... snip some other commits ...]
	   * cccc111 cherry-pick of C
	   * aaaa111 cherry-pick of A
	   [... snip a lot more that has happened ...]
	   | * cccc000 (topic) commit C
	   | * bbbb000 commit B
	   | * aaaa000 commit A
	   |/
	   o 1234567 branch point

       In such cases, git-cherry shows a concise summary of what has yet to be applied:

	   $ git cherry origin/master topic
	   - cccc000... commit C
	   + bbbb000... commit B
	   - aaaa000... commit A

       Here, we see that the commits A and C (marked with -) can be dropped from your topic branch when you rebase it on top of origin/master,
       while the commit B (marked with +) still needs to be kept so that it will be sent to be applied to origin/master.

   Using a limit
       The optional <limit> is useful in cases where your topic is based on other work that is not in upstream. Expanding on the previous example,
       this might look like:

	   $ git log --graph --oneline --decorate --boundary origin/master...topic
	   * 7654321 (origin/master) upstream tip commit
	   [... snip some other commits ...]
	   * cccc111 cherry-pick of C
	   * aaaa111 cherry-pick of A
	   [... snip a lot more that has happened ...]
	   | * cccc000 (topic) commit C
	   | * bbbb000 commit B
	   | * aaaa000 commit A
	   | * 0000fff (base) unpublished stuff F
	   [... snip ...]
	   | * 0000aaa unpublished stuff A
	   |/
	   o 1234567 merge-base between upstream and topic

       By specifying base as the limit, you can avoid listing commits between base and topic:

	   $ git cherry origin/master topic base
	   - cccc000... commit C
	   + bbbb000... commit B
	   - aaaa000... commit A

SEE ALSO

       git-patch-id(1)

GIT

       Part of the git(1) suite

Git 1.8.5.3							    01/14/2014							     GIT-CHERRY(1)

10 More Discussions You Might Find Interesting

1. Shell Programming and Scripting

diff 2 files; output diff's to 3rd file

Discussion started by: blt123

2. UNIX for Advanced & Expert Users

Script to Find Diff from two folders

Discussion started by: gkrishnag

3. UNIX for Dummies Questions & Answers

diff

Discussion started by: tungaw2004

4. Shell Programming and Scripting

Simulate SVN diff using plain diff

Discussion started by: ackbarr