← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to Documentation/git-merge.txt

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-04-22 13:31:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20070422133105-xg8fnm18r2cxcbg1
Tags: upstream-1.5.1.2
Import upstream version 1.5.1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
Documentation/git-merge.txt
3
3
 
4
4
NAME
5
5
----
6
 
git-merge - Grand Unified Merge Driver
 
6
git-merge - Join two or more development histories together
7
7
 
8
8
 
9
9
SYNOPSIS
10
10
--------
11
 
'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>...
12
 
 
 
11
[verse]
 
12
'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
 
13
        [-m <msg>] <remote> <remote>...
13
14
 
14
15
DESCRIPTION
15
16
-----------
16
 
This is the top-level user interface to the merge machinery
 
17
This is the top-level interface to the merge machinery
17
18
which drives multiple merge strategy scripts.
18
19
 
19
20
 
27
28
        to give a good default for automated `git-merge` invocations.
28
29
 
29
30
<head>::
30
 
        our branch head commit.
 
31
        Our branch head commit.  This has to be `HEAD`, so new
 
32
        syntax does not require it
31
33
 
32
34
<remote>::
33
 
        other branch head merged into our branch.  You need at
 
35
        Other branch head merged into our branch.  You need at
34
36
        least one <remote>.  Specifying more than one <remote>
35
37
        obviously means you are trying an Octopus.
36
38
 
134
136
 
135
137
 * Resolve the conflicts.  `git-diff` would report only the
136
138
   conflicting paths because of the above 2. and 3..  Edit the
137
 
   working tree files into a desirable shape, `git-update-index`
 
139
   working tree files into a desirable shape, `git-add` or `git-rm`
138
140
   them, to make the index file contain what the merge result
139
141
   should be, and run `git-commit` to commit the result.
140
142