LinuxGuruz
  • Last 5 Forum Topics
    Replies
    Views
    Last post


The Web Only This Site
  • BOOKMARK

  • ADD TO FAVORITES

  • REFERENCES


  • MARC

    Mailing list ARChives
    - Search by -
     Subjects
     Authors
     Bodies





    FOLDOC

    Computing Dictionary




  • Text Link Ads






  • LINUX man pages
  • Linux Man Page Viewer


    The following form allows you to view linux man pages.

    Command:

    git-merge-index

    
    
    

    SYNOPSIS

           git merge-index [-o] [-q] <merge-program> (-a | [--] <file>\*)
    
    
    

    DESCRIPTION

           This looks up the <file>(s) in the index and, if there are any merge
           entries, passes the SHA1 hash for those files as arguments 1, 2, 3
           (empty argument if no file), and <file> as argument 4. File modes for
           the three files are passed as arguments 5, 6 and 7.
    
    
    

    OPTIONS

           --
               Do not interpret any more arguments as options.
    
           -a
               Run merge against all files in the index that need merging.
    
           -o
               Instead of stopping at the first failed merge, do all of them in
               one shot - continue with merging even when previous merges returned
               errors, and only return the error code after all the merges.
    
           -q
               Do not complain about a failed merge program (a merge program
               failure usually indicates conflicts during the merge). This is for
               porcelains which might want to emit custom messages.
    
           If git merge-index is called with multiple <file>s (or -a) then it
           processes them in turn only stopping if merge returns a non-zero exit
           code.
    
           Typically this is run with a script calling git's imitation of the
           merge command from the RCS package.
    
           A sample script called git merge-one-file is included in the
           distribution.
    
           ALERT ALERT ALERT! The git "merge object order" is different from the
           RCS merge program merge object order. In the above ordering, the
           original is first. But the argument order to the 3-way merge program
           merge is to have the original in the middle. Don't ask me why.
    
           Examples:
    
               torvalds@ppc970:~/merge-test> git merge-index cat MM
               This is MM from the original tree.                    # original
               This is modified MM in the branch A.                  # merge1
               This is modified MM in the branch B.                  # merge2
               This is modified MM in the branch B.                  # current contents
    
           or
    
               torvalds@ppc970:~/merge-test> git merge-index cat AA MM
    
    
    

    DOCUMENTATION

           Documentation by David Greaves, Junio C Hamano and the git-list
           <git@vger.kernel.org[3]>.
    
    
    

    GIT

           Part of the git(1) suite
    
    
    

    NOTES

            1. torvalds@osdl.org
               mailto:torvalds@osdl.org
    
            2. pasky@ucw.cz
               mailto:pasky@ucw.cz
    
            3. git@vger.kernel.org
               mailto:git@vger.kernel.org
    
    
    

    Git 1.7.1 03/04/2013 GIT-MERGE-INDEX(1)

    
    
  • MORE RESOURCE


  • Linux

    The Distributions





    Linux

    The Software





    Linux

    The News



  • MARKETING






  • Toll Free

webmaster@linuxguruz.com
Copyright © 1999 - 2016 by LinuxGuruz