Welcome to Linux Knowledge Base and Tutorial
"The place where you learn linux"
Linux Magazine

 Create an AccountHome | Submit News | Your Account  

Tutorial Menu
Linux Tutorial Home
Table of Contents

· Introduction to Operating Systems
· Linux Basics
· Working with the System
· Shells and Utilities
· Editing Files
· Basic Administration
· The Operating System
· The X Windowing System
· The Computer Itself
· Networking
· System Monitoring
· Solving Problems
· Security
· Installing and Upgrading
· Linux and Windows

Glossary
MoreInfo
Man Pages
Linux Topics
Test Your Knowledge

Site Menu
Site Map
FAQ
Copyright Info
Terms of Use
Privacy Info
Disclaimer
WorkBoard
Thanks
Donations
Advertising
Masthead / Impressum
Your Account

Communication
Feedback
Forums
Private Messages
Surveys

Features
HOWTOs
News Archive
Submit News
Topics
User Articles
Web Links

Google
Google


The Web
linux-tutorial.info

Who's Online
There are currently, 181 guest(s) and 0 member(s) that are online.

You are an Anonymous user. You can register for free by clicking here

  

combinediff




SYNOPSIS

       combinediff [-p n] [-U n] [-d PAT] [-Bbiqwz]
                   [--interpolate | --combine] diff1 diff2

       combinediff {--help | --version}


DESCRIPTION

       combinediff  creates a unified diff that expresses the sum
       of two diffs. The diff files must be listed in  the  order
       that  they  are to be applied. For best results, the diffs
       must have at least three lines of context.

       The diffs may be in context format. The  output,  however,
       will be in unified format.


OPTIONS

       -p n   When  comparing filenames, ignore the first n path­
              name components from both patches. (This is similar
              to the -p option to GNU patch(1).)

       -q     Quieter  output.  Don't emit rationale lines at the
              beginning of each patch.

       -U n   Attempt to display n lines of context (requires  at
              least  n  lines  of  context  in both input files).
              (This is similar to the -U option to GNU  diff(1).)

       -d pattern
              Don't  display  any context on files that match the
              shell wildcard pattern. This option  can  be  given
              multiple times.

              Note  that the interpretation of the shell wildcard
              pattern does not count slash characters or  periods
              as  special  (in other words, no flags are given to
              fnmatch). This is so that ``*/basename''-type  pat­
              terns  can  be given without limiting the number of
              pathname components.

       -i     Consider upper- and lower-case to be the same.

       -w     Ignore whitespace changes in patches.


       --combine
              Run as ``combinediff''. This is the default.

       --help Display a short usage message.

       --version
              Display the version number of combinediff.


BUGS

       The -U option is a bit erratic: it can control the  amount
       of  context  displayed for files that are modified in both
       patches, but not for files that only appear in  one  patch
       (which  appear with the same amount of context in the out­
       put as in the input).


SEE ALSO

       interdiff(1)


AUTHOR

       Tim Waugh <twaugh@redhat.com>.

patchutils                 17 Apr 2002             COMBINEDIFF(1)

An undefined database error occurred. SELECT distinct pages.pagepath,pages.pageid FROM pages, page2command WHERE pages.pageid = page2command.pageid AND commandid =


  

There are several different ways to navigate the tutorial.


Login
Nickname

Password

Security Code
Security Code
Type Security Code


Don't have an account yet? You can create one. As a registered user you have some advantages like theme manager, comments configuration and post comments with your name.

Help if you can!


Amazon Wish List

Did You Know?
You can choose larger fonts by selecting a different themes.


Friends



Tell a Friend About Us

Bookmark and Share



Web site powered by PHP-Nuke

Is this information useful? At the very least you can help by spreading the word to your favorite newsgroups, mailing lists and forums.
All logos and trademarks in this site are property of their respective owner. The comments are property of their posters. Articles are the property of their respective owners. Unless otherwise stated in the body of the article, article content (C) 1994-2013 by James Mohr. All rights reserved. The stylized page/paper, as well as the terms "The Linux Tutorial", "The Linux Server Tutorial", "The Linux Knowledge Base and Tutorial" and "The place where you learn Linux" are service marks of James Mohr. All rights reserved.
The Linux Knowledge Base and Tutorial may contain links to sites on the Internet, which are owned and operated by third parties. The Linux Tutorial is not responsible for the content of any such third-party site. By viewing/utilizing this web site, you have agreed to our disclaimer, terms of use and privacy policy. Use of automated download software ("harvesters") such as wget, httrack, etc. causes the site to quickly exceed its bandwidth limitation and are therefore expressly prohibited. For more details on this, take a look here

PHP-Nuke Copyright © 2004 by Francisco Burzi. This is free software, and you may redistribute it under the GPL. PHP-Nuke comes with absolutely no warranty, for details, see the license.
Page Generation: 0.07 Seconds