Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Autogenerated HTML docs for v1.6.2.1-389-geed1

  • Loading branch information...
commit 1de7572eb1aa483cc2aaca1db274928ffc6830f0 1 parent 625716a
Junio C Hamano authored
View
7 RelNotes-1.6.3.txt
@@ -22,6 +22,13 @@ branch pointed at by its HEAD, gets a large warning. You can choose what
should happen upon such a push by setting the configuration variable
receive.denyDeleteCurrent in the receiving repository.
+In a future release, the default of "git push" without further
+arguments might be changed. Currently, it will push all matching
+refspecs to the current remote. A configuration variable push.default
+has been introduced to select the default behaviour. To ease the
+transition, a big warning is issued if this is not configured and a
+git push without arguments is attempted.
+
Updates since v1.6.2
--------------------
View
2  cmds-plumbinginterrogators.txt
@@ -1,5 +1,5 @@
linkgit:git-cat-file[1]::
- Provide content or type/size information for repository objects.
+ Provide content or type and size information for repository objects.
linkgit:git-diff-files[1]::
Compares files in the working tree and the index.
View
2  cmds-purehelpers.txt
@@ -2,7 +2,7 @@ linkgit:git-check-attr[1]::
Display gitattributes information.
linkgit:git-check-ref-format[1]::
- Make sure ref name is well formed.
+ Ensures that a reference name is well formed.
linkgit:git-fmt-merge-msg[1]::
Produce a merge commit message.
View
18 config.txt
@@ -1194,6 +1194,24 @@ pull.octopus::
pull.twohead::
The default merge strategy to use when pulling a single branch.
+push.default::
+ Defines the action git push should take if no refspec is given
+ on the command line, no refspec is configured in the remote, and
+ no refspec is implied by any of the options given on the command
+ line.
++
+The term `current remote` means the remote configured for the current
+branch, or `origin` if no remote is configured. `origin` is also used
+if you are not on any branch. Possible values are:
++
+* `nothing` do not push anything.
+* `matching` push all matching branches to the current remote.
+ All branches having the same name in both ends are considered to be
+ matching. This is the current default value.
+* `tracking` push the current branch to the branch it is tracking.
+* `current` push the current branch to a branch of the same name on the
+ current remote.
+
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
rebase. False by default.
View
24 git-bisect.html
@@ -380,7 +380,7 @@ <h3 id="_basic_bisect_commands_start_bad_good">Basic bisect commands: start, bad
<div class="para"><p>Eventually there will be no more revisions left to bisect, and you
will have been left with the first bad kernel revision in "refs/bisect/bad".</p></div>
<h3 id="_bisect_reset">Bisect reset</h3><div style="clear:left"></div>
-<div class="para"><p>To return to the original head after a bisect session, you issue the
+<div class="para"><p>To return to the original head after a bisect session, issue the
following command:</p></div>
<div class="listingblock">
<div class="content">
@@ -390,8 +390,8 @@ <h3 id="_bisect_reset">Bisect reset</h3><div style="clear:left"></div>
bisection commit ("git bisect start" will also do that, as it resets
the bisection state).</p></div>
<h3 id="_bisect_visualize">Bisect visualize</h3><div style="clear:left"></div>
-<div class="para"><p>To see the currently remaining suspects in <em>gitk</em>, the following command
-is issued during the bisection process:</p></div>
+<div class="para"><p>To see the currently remaining suspects in <em>gitk</em>, issue the following
+command during the bisection process:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bisect visualize</tt></pre>
@@ -405,7 +405,7 @@ <h3 id="_bisect_visualize">Bisect visualize</h3><div style="clear:left"></div>
<pre><tt>$ git bisect view --stat</tt></pre>
</div></div>
<h3 id="_bisect_log_and_bisect_replay">Bisect log and bisect replay</h3><div style="clear:left"></div>
-<div class="para"><p>After having marked revisions as good or bad, you issue the following
+<div class="para"><p>After having marked revisions as good or bad, issue the following
command to show what has been done so far:</p></div>
<div class="listingblock">
<div class="content">
@@ -421,7 +421,7 @@ <h3 id="_bisect_log_and_bisect_replay">Bisect log and bisect replay</h3><div sty
$ git bisect replay that-file</tt></pre>
</div></div>
<h3 id="_avoiding_testing_a_commit">Avoiding testing a commit</h3><div style="clear:left"></div>
-<div class="para"><p>If in the middle of a bisect session, you know that the next suggested
+<div class="para"><p>If, in the middle of a bisect session, you know that the next suggested
revision is not a good one to test (e.g. the change the commit
introduces is known not to work in your environment and you know it
does not have anything to do with the bug you are chasing), you may
@@ -435,8 +435,8 @@ <h3 id="_avoiding_testing_a_commit">Avoiding testing a commit</h3><div style="cl
$ git reset --hard HEAD~3 # try 3 revisions before what
# was suggested</tt></pre>
</div></div>
-<div class="para"><p>Then compile and test the chosen revision. Afterwards the revision
-is marked as good or bad in the usual manner.</p></div>
+<div class="para"><p>Then compile and test the chosen revision, and afterwards mark
+the revision as good or bad in the usual manner.</p></div>
<h3 id="_bisect_skip">Bisect skip</h3><div style="clear:left"></div>
<div class="para"><p>Instead of choosing by yourself a nearby commit, you can ask git
to do it for you by issuing the command:</p></div>
@@ -453,16 +453,16 @@ <h3 id="_bisect_skip">Bisect skip</h3><div style="clear:left"></div>
<div class="content">
<pre><tt>$ git bisect skip v2.5..v2.6</tt></pre>
</div></div>
-<div class="para"><p>The effect of this would be that no commit between <tt>v2.5</tt> excluded and
-<tt>v2.6</tt> included could be tested.</p></div>
+<div class="para"><p>This tells the bisect process that no commit after <tt>v2.5</tt>, up to and
+including <tt>v2.6</tt>, should be tested.</p></div>
<div class="para"><p>Note that if you also want to skip the first commit of the range you
would issue the command:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bisect skip v2.5 v2.5..v2.6</tt></pre>
</div></div>
-<div class="para"><p>This would cause the commits between <tt>v2.5</tt> included and <tt>v2.6</tt> included
-to be skipped.</p></div>
+<div class="para"><p>This tells the bisect process that the commits between <tt>v2.5</tt> included
+and <tt>v2.6</tt> included should be skipped.</p></div>
<h3 id="_cutting_down_bisection_by_giving_more_parameters_to_bisect_start">Cutting down bisection by giving more parameters to bisect start</h3><div style="clear:left"></div>
<div class="para"><p>You can further cut down the number of trials, if you know what part of
the tree is involved in the problem you are tracking down, by specifying
@@ -600,7 +600,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-22 08:21:21 UTC
+Last updated 2009-03-26 08:39:12 UTC
</div>
</div>
</body>
View
22 git-bisect.txt
@@ -81,7 +81,7 @@ will have been left with the first bad kernel revision in "refs/bisect/bad".
Bisect reset
~~~~~~~~~~~~
-To return to the original head after a bisect session, you issue the
+To return to the original head after a bisect session, issue the
following command:
------------------------------------------------
@@ -95,8 +95,8 @@ the bisection state).
Bisect visualize
~~~~~~~~~~~~~~~~
-To see the currently remaining suspects in 'gitk', the following command
-is issued during the bisection process:
+To see the currently remaining suspects in 'gitk', issue the following
+command during the bisection process:
------------
$ git bisect visualize
@@ -115,7 +115,7 @@ $ git bisect view --stat
Bisect log and bisect replay
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-After having marked revisions as good or bad, you issue the following
+After having marked revisions as good or bad, issue the following
command to show what has been done so far:
------------
@@ -135,7 +135,7 @@ $ git bisect replay that-file
Avoiding testing a commit
~~~~~~~~~~~~~~~~~~~~~~~~~
-If in the middle of a bisect session, you know that the next suggested
+If, in the middle of a bisect session, you know that the next suggested
revision is not a good one to test (e.g. the change the commit
introduces is known not to work in your environment and you know it
does not have anything to do with the bug you are chasing), you may
@@ -151,8 +151,8 @@ $ git reset --hard HEAD~3 # try 3 revisions before what
# was suggested
------------
-Then compile and test the chosen revision. Afterwards the revision
-is marked as good or bad in the usual manner.
+Then compile and test the chosen revision, and afterwards mark
+the revision as good or bad in the usual manner.
Bisect skip
~~~~~~~~~~~~
@@ -175,8 +175,8 @@ using the "'<commit1>'..'<commit2>'" notation. For example:
$ git bisect skip v2.5..v2.6
------------
-The effect of this would be that no commit between `v2.5` excluded and
-`v2.6` included could be tested.
+This tells the bisect process that no commit after `v2.5`, up to and
+including `v2.6`, should be tested.
Note that if you also want to skip the first commit of the range you
would issue the command:
@@ -185,8 +185,8 @@ would issue the command:
$ git bisect skip v2.5 v2.5..v2.6
------------
-This would cause the commits between `v2.5` included and `v2.6` included
-to be skipped.
+This tells the bisect process that the commits between `v2.5` included
+and `v2.6` included should be skipped.
Cutting down bisection by giving more parameters to bisect start
View
88 git-bundle.html
@@ -330,13 +330,13 @@ <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="para"><p>Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot
-be directly connected so the interactive git protocols (git, ssh,
-rsync, http) cannot be used. This command provides support for
+be directly connected, and therefore the interactive git protocols (git,
+ssh, rsync, http) cannot be used. This command provides support for
<em>git-fetch</em> and <em>git-pull</em> to operate by packaging objects and references
in an archive at the originating machine, then importing those into
another repository using <em>git-fetch</em> and <em>git-pull</em>
after moving the archive by some means (i.e., by sneakernet). As no
-direct connection between repositories exists, the user must specify a
+direct connection between the repositories exists, the user must specify a
basis for the bundle that is held by the destination repository: the
bundle assumes that all objects in the basis are already in the
destination repository.</p></div>
@@ -363,7 +363,7 @@ <h2 id="_options">OPTIONS</h2>
bundle format itself as well as checking that the prerequisite
commits exist and are fully linked in the current repository.
<em>git-bundle</em> prints a list of missing commits, if any, and exits
- with non-zero status.
+ with a non-zero status.
</p>
</dd>
<dt>
@@ -383,8 +383,8 @@ <h2 id="_options">OPTIONS</h2>
<p>
Passes the objects in the bundle to <em>git-index-pack</em>
for storage in the repository, then prints the names of all
- defined references. If a reflist is given, only references
- matching those in the given list are printed. This command is
+ defined references. If a list of references is given, only
+ references matching those in the list are printed. This command is
really plumbing, intended to be called only by <em>git-fetch</em>.
</p>
</dd>
@@ -394,8 +394,8 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
A list of arguments, acceptable to <em>git-rev-parse</em> and
- <em>git-rev-list</em>, that specify the specific objects and references
- to transport. For example, "master~10..master" causes the
+ <em>git-rev-list</em>, that specifies the specific objects and references
+ to transport. For example, <tt>master\~10..master</tt> causes the
current master reference to be packaged along with all objects
added since its 10th ancestor commit. There is no explicit
limit to the number of references and objects that may be
@@ -410,8 +410,8 @@ <h2 id="_options">OPTIONS</h2>
A list of references used to limit the references reported as
available. This is principally of use to <em>git-fetch</em>, which
expects to receive only those references asked for and not
- necessarily everything in the pack (in this case, <em>git-bundle</em> is
- acting like <em>git-fetch-pack</em>).
+ necessarily everything in the pack (in this case, <em>git-bundle</em> acts
+ like <em>git-fetch-pack</em>).
</p>
</dd>
</dl></div>
@@ -420,15 +420,15 @@ <h2 id="_specifying_references">SPECIFYING REFERENCES</h2>
<div class="sectionbody">
<div class="para"><p><em>git-bundle</em> will only package references that are shown by
<em>git-show-ref</em>: this includes heads, tags, and remote heads. References
-such as master~1 cannot be packaged, but are perfectly suitable for
+such as <tt>master\~1</tt> cannot be packaged, but are perfectly suitable for
defining the basis. More than one reference may be packaged, and more
than one basis can be specified. The objects packaged are those not
contained in the union of the given bases. Each basis can be
-specified explicitly (e.g., ^master~10), or implicitly (e.g.,
-master~10..master, --since=10.days.ago master).</p></div>
+specified explicitly (e.g. <tt>^master\~10</tt>), or implicitly (e.g.
+<tt>master\~10..master</tt>, <tt>--since=10.days.ago master</tt>).</p></div>
<div class="para"><p>It is very important that the basis used be held by the destination.
-It is okay to err on the side of conservatism, causing the bundle file
-to contain objects already in the destination as these are ignored
+It is okay to err on the side of caution, causing the bundle file
+to contain objects already in the destination, as these are ignored
when unpacking at the destination.</p></div>
</div>
<h2 id="_example">EXAMPLE</h2>
@@ -436,28 +436,28 @@ <h2 id="_example">EXAMPLE</h2>
<div class="para"><p>Assume you want to transfer the history from a repository R1 on machine A
to another repository R2 on machine B.
For whatever reason, direct connection between A and B is not allowed,
-but we can move data from A to B via some mechanism (CD, email, etc).
-We want to update R2 with developments made on branch master in R1.</p></div>
-<div class="para"><p>To bootstrap the process, you can first create a bundle that doesn't have
-any basis. You can use a tag to remember up to what commit you sent out
-in order to make it easy to later update the other repository with
-incremental bundle,</p></div>
+but we can move data from A to B via some mechanism (CD, email, etc.).
+We want to update R2 with development made on the branch master in R1.</p></div>
+<div class="para"><p>To bootstrap the process, you can first create a bundle that does not have
+any basis. You can use a tag to remember up to what commit you last
+processed, in order to make it easy to later update the other repository
+with an incremental bundle:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>machineA$ cd R1
machineA$ git bundle create file.bundle master
machineA$ git tag -f lastR2bundle master</tt></pre>
</div></div>
-<div class="para"><p>Then you sneakernet file.bundle to the target machine B. Because you don't
-have to have any object to extract objects from such a bundle, not only
-you can fetch/pull from a bundle, you can clone from it as if it was a
-remote repository.</p></div>
+<div class="para"><p>Then you transfer file.bundle to the target machine B. If you are creating
+the repository on machine B, then you can clone from the bundle as if it
+were a remote repository instead of creating an empty repository and then
+pulling or fetching objects from the bundle:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>machineB$ git clone /home/me/tmp/file.bundle R2</tt></pre>
</div></div>
<div class="para"><p>This will define a remote called "origin" in the resulting repository that
-lets you fetch and pull from the bundle. $GIT_DIR/config file in R2 may
+lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will
have an entry like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -465,61 +465,61 @@ <h2 id="_example">EXAMPLE</h2>
url = /home/me/tmp/file.bundle
fetch = refs/heads/*:refs/remotes/origin/*</tt></pre>
</div></div>
-<div class="para"><p>You can fetch/pull to update the resulting mine.git repository after
-replacing the bundle you store at /home/me/tmp/file.bundle with incremental
-updates from here on.</p></div>
-<div class="para"><p>After working more in the original repository, you can create an
-incremental bundle to update the other:</p></div>
+<div class="para"><p>To update the resulting mine.git repository, you can fetch or pull after
+replacing the bundle stored at /home/me/tmp/file.bundle with incremental
+updates.</p></div>
+<div class="para"><p>After working some more in the original repository, you can create an
+incremental bundle to update the other repository:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>machineA$ cd R1
machineA$ git bundle create file.bundle lastR2bundle..master
machineA$ git tag -f lastR2bundle master</tt></pre>
</div></div>
-<div class="para"><p>and sneakernet it to the other machine to replace /home/me/tmp/file.bundle,
-and pull from it.</p></div>
+<div class="para"><p>You then transfer the bundle to the other machine to replace
+/home/me/tmp/file.bundle, and pull from it.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>machineB$ cd R2
machineB$ git pull</tt></pre>
</div></div>
<div class="para"><p>If you know up to what commit the intended recipient repository should
-have the necessary objects for, you can use that knowledge to specify the
+have the necessary objects, you can use that knowledge to specify the
basis, giving a cut-off point to limit the revisions and objects that go
in the resulting bundle. The previous example used lastR2bundle tag
-for this purpose, but you can use other options you would give to
+for this purpose, but you can use any other options that you would give to
the <a href="git-log.html">git-log(1)</a> command. Here are more examples:</p></div>
-<div class="para"><p>You can use a tag that is present in both.</p></div>
+<div class="para"><p>You can use a tag that is present in both:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle create mybundle v1.0.0..master</tt></pre>
</div></div>
-<div class="para"><p>You can use a basis based on time.</p></div>
+<div class="para"><p>You can use a basis based on time:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle create mybundle --since=10.days master</tt></pre>
</div></div>
-<div class="para"><p>Or you can use the number of commits.</p></div>
+<div class="para"><p>You can use the number of commits:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle create mybundle -10 master</tt></pre>
</div></div>
<div class="para"><p>You can run <tt>git-bundle verify</tt> to see if you can extract from a bundle
-that was created with a basis.</p></div>
+that was created with a basis:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle verify mybundle</tt></pre>
</div></div>
<div class="para"><p>This will list what commits you must have in order to extract from the
-bundle and will error out if you don't have them.</p></div>
+bundle and will error out if you do not have them.</p></div>
<div class="para"><p>A bundle from a recipient repository's point of view is just like a
-regular repository it fetches/pulls from. You can for example map
-refs, like this example, when fetching:</p></div>
+regular repository which it fetches or pulls from. You can, for example, map
+references when fetching:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git fetch mybundle master:localRef</tt></pre>
</div></div>
-<div class="para"><p>Or see what refs it offers.</p></div>
+<div class="para"><p>You can also see what references it offers.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git ls-remote mybundle</tt></pre>
@@ -535,7 +535,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:04 UTC
+Last updated 2009-03-26 08:39:12 UTC
</div>
</div>
</body>
View
86 git-bundle.txt
@@ -19,13 +19,13 @@ DESCRIPTION
Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot
-be directly connected so the interactive git protocols (git, ssh,
-rsync, http) cannot be used. This command provides support for
+be directly connected, and therefore the interactive git protocols (git,
+ssh, rsync, http) cannot be used. This command provides support for
'git-fetch' and 'git-pull' to operate by packaging objects and references
in an archive at the originating machine, then importing those into
another repository using 'git-fetch' and 'git-pull'
after moving the archive by some means (i.e., by sneakernet). As no
-direct connection between repositories exists, the user must specify a
+direct connection between the repositories exists, the user must specify a
basis for the bundle that is held by the destination repository: the
bundle assumes that all objects in the basis are already in the
destination repository.
@@ -43,7 +43,7 @@ verify <file>::
bundle format itself as well as checking that the prerequisite
commits exist and are fully linked in the current repository.
'git-bundle' prints a list of missing commits, if any, and exits
- with non-zero status.
+ with a non-zero status.
list-heads <file>::
Lists the references defined in the bundle. If followed by a
@@ -53,14 +53,14 @@ list-heads <file>::
unbundle <file>::
Passes the objects in the bundle to 'git-index-pack'
for storage in the repository, then prints the names of all
- defined references. If a reflist is given, only references
- matching those in the given list are printed. This command is
+ defined references. If a list of references is given, only
+ references matching those in the list are printed. This command is
really plumbing, intended to be called only by 'git-fetch'.
[git-rev-list-args...]::
A list of arguments, acceptable to 'git-rev-parse' and
- 'git-rev-list', that specify the specific objects and references
- to transport. For example, "master~10..master" causes the
+ 'git-rev-list', that specifies the specific objects and references
+ to transport. For example, `master\~10..master` causes the
current master reference to be packaged along with all objects
added since its 10th ancestor commit. There is no explicit
limit to the number of references and objects that may be
@@ -71,24 +71,24 @@ unbundle <file>::
A list of references used to limit the references reported as
available. This is principally of use to 'git-fetch', which
expects to receive only those references asked for and not
- necessarily everything in the pack (in this case, 'git-bundle' is
- acting like 'git-fetch-pack').
+ necessarily everything in the pack (in this case, 'git-bundle' acts
+ like 'git-fetch-pack').
SPECIFYING REFERENCES
---------------------
'git-bundle' will only package references that are shown by
'git-show-ref': this includes heads, tags, and remote heads. References
-such as master~1 cannot be packaged, but are perfectly suitable for
+such as `master\~1` cannot be packaged, but are perfectly suitable for
defining the basis. More than one reference may be packaged, and more
than one basis can be specified. The objects packaged are those not
contained in the union of the given bases. Each basis can be
-specified explicitly (e.g., ^master~10), or implicitly (e.g.,
-master~10..master, --since=10.days.ago master).
+specified explicitly (e.g. `^master\~10`), or implicitly (e.g.
+`master\~10..master`, `--since=10.days.ago master`).
It is very important that the basis used be held by the destination.
-It is okay to err on the side of conservatism, causing the bundle file
-to contain objects already in the destination as these are ignored
+It is okay to err on the side of caution, causing the bundle file
+to contain objects already in the destination, as these are ignored
when unpacking at the destination.
EXAMPLE
@@ -97,13 +97,13 @@ EXAMPLE
Assume you want to transfer the history from a repository R1 on machine A
to another repository R2 on machine B.
For whatever reason, direct connection between A and B is not allowed,
-but we can move data from A to B via some mechanism (CD, email, etc).
-We want to update R2 with developments made on branch master in R1.
+but we can move data from A to B via some mechanism (CD, email, etc.).
+We want to update R2 with development made on the branch master in R1.
-To bootstrap the process, you can first create a bundle that doesn't have
-any basis. You can use a tag to remember up to what commit you sent out
-in order to make it easy to later update the other repository with
-incremental bundle,
+To bootstrap the process, you can first create a bundle that does not have
+any basis. You can use a tag to remember up to what commit you last
+processed, in order to make it easy to later update the other repository
+with an incremental bundle:
----------------
machineA$ cd R1
@@ -111,17 +111,17 @@ machineA$ git bundle create file.bundle master
machineA$ git tag -f lastR2bundle master
----------------
-Then you sneakernet file.bundle to the target machine B. Because you don't
-have to have any object to extract objects from such a bundle, not only
-you can fetch/pull from a bundle, you can clone from it as if it was a
-remote repository.
+Then you transfer file.bundle to the target machine B. If you are creating
+the repository on machine B, then you can clone from the bundle as if it
+were a remote repository instead of creating an empty repository and then
+pulling or fetching objects from the bundle:
----------------
machineB$ git clone /home/me/tmp/file.bundle R2
----------------
This will define a remote called "origin" in the resulting repository that
-lets you fetch and pull from the bundle. $GIT_DIR/config file in R2 may
+lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will
have an entry like this:
------------------------
@@ -130,12 +130,12 @@ have an entry like this:
fetch = refs/heads/*:refs/remotes/origin/*
------------------------
-You can fetch/pull to update the resulting mine.git repository after
-replacing the bundle you store at /home/me/tmp/file.bundle with incremental
-updates from here on.
+To update the resulting mine.git repository, you can fetch or pull after
+replacing the bundle stored at /home/me/tmp/file.bundle with incremental
+updates.
-After working more in the original repository, you can create an
-incremental bundle to update the other:
+After working some more in the original repository, you can create an
+incremental bundle to update the other repository:
----------------
machineA$ cd R1
@@ -143,8 +143,8 @@ machineA$ git bundle create file.bundle lastR2bundle..master
machineA$ git tag -f lastR2bundle master
----------------
-and sneakernet it to the other machine to replace /home/me/tmp/file.bundle,
-and pull from it.
+You then transfer the bundle to the other machine to replace
+/home/me/tmp/file.bundle, and pull from it.
----------------
machineB$ cd R2
@@ -152,49 +152,49 @@ machineB$ git pull
----------------
If you know up to what commit the intended recipient repository should
-have the necessary objects for, you can use that knowledge to specify the
+have the necessary objects, you can use that knowledge to specify the
basis, giving a cut-off point to limit the revisions and objects that go
in the resulting bundle. The previous example used lastR2bundle tag
-for this purpose, but you can use other options you would give to
+for this purpose, but you can use any other options that you would give to
the linkgit:git-log[1] command. Here are more examples:
-You can use a tag that is present in both.
+You can use a tag that is present in both:
----------------
$ git bundle create mybundle v1.0.0..master
----------------
-You can use a basis based on time.
+You can use a basis based on time:
----------------
$ git bundle create mybundle --since=10.days master
----------------
-Or you can use the number of commits.
+You can use the number of commits:
----------------
$ git bundle create mybundle -10 master
----------------
You can run `git-bundle verify` to see if you can extract from a bundle
-that was created with a basis.
+that was created with a basis:
----------------
$ git bundle verify mybundle
----------------
This will list what commits you must have in order to extract from the
-bundle and will error out if you don't have them.
+bundle and will error out if you do not have them.
A bundle from a recipient repository's point of view is just like a
-regular repository it fetches/pulls from. You can for example map
-refs, like this example, when fetching:
+regular repository which it fetches or pulls from. You can, for example, map
+references when fetching:
----------------
$ git fetch mybundle master:localRef
----------------
-Or see what refs it offers.
+You can also see what references it offers.
----------------
$ git ls-remote mybundle
View
20 git-cat-file.html
@@ -314,7 +314,7 @@
<h2>NAME</h2>
<div class="sectionbody">
<p>git-cat-file -
- Provide content or type/size information for repository objects
+ Provide content or type and size information for repository objects
</p>
</div>
</div>
@@ -326,11 +326,11 @@
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>In the first form, provides content or type of objects in the repository. The
-type is required unless <em>-t</em> or <em>-p</em> is used to find the object type, or <em>-s</em>
-is used to find the object size.</p></div>
-<div class="para"><p>In the second form, a list of object (separated by LFs) is provided on stdin,
-and the SHA1, type, and size of each object is printed on stdout.</p></div>
+<div class="para"><p>In its first form, the command provides the content or the type of an object in
+the repository. The type is required unless <em>-t</em> or <em>-p</em> is used to find the
+object type, or <em>-s</em> is used to find the object size.</p></div>
+<div class="para"><p>In the second form, a list of objects (separated by linefeeds) is provided on
+stdin, and the SHA1, type, and size of each object is printed on stdout.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -342,7 +342,7 @@ <h2 id="_options">OPTIONS</h2>
<p>
The name of the object to show.
For a more complete list of ways to spell object names, see
- "SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.
+ the "SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.
</p>
</dd>
<dt>
@@ -407,8 +407,8 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Print the SHA1, type, and size of each object provided on stdin. May not be
- combined with any other options or arguments.
+ Print the SHA1, type, and size of each object provided on stdin. May not
+ be combined with any other options or arguments.
</p>
</dd>
</dl></div>
@@ -455,7 +455,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:04 UTC
+Last updated 2009-03-26 08:39:12 UTC
</div>
</div>
</body>
View
18 git-cat-file.txt
@@ -3,7 +3,7 @@ git-cat-file(1)
NAME
----
-git-cat-file - Provide content or type/size information for repository objects
+git-cat-file - Provide content or type and size information for repository objects
SYNOPSIS
@@ -14,19 +14,19 @@ SYNOPSIS
DESCRIPTION
-----------
-In the first form, provides content or type of objects in the repository. The
-type is required unless '-t' or '-p' is used to find the object type, or '-s'
-is used to find the object size.
+In its first form, the command provides the content or the type of an object in
+the repository. The type is required unless '-t' or '-p' is used to find the
+object type, or '-s' is used to find the object size.
-In the second form, a list of object (separated by LFs) is provided on stdin,
-and the SHA1, type, and size of each object is printed on stdout.
+In the second form, a list of objects (separated by linefeeds) is provided on
+stdin, and the SHA1, type, and size of each object is printed on stdout.
OPTIONS
-------
<object>::
The name of the object to show.
For a more complete list of ways to spell object names, see
- "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
+ the "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
-t::
Instead of the content, show the object type identified by
@@ -56,8 +56,8 @@ OPTIONS
stdin. May not be combined with any other options or arguments.
--batch-check::
- Print the SHA1, type, and size of each object provided on stdin. May not be
- combined with any other options or arguments.
+ Print the SHA1, type, and size of each object provided on stdin. May not
+ be combined with any other options or arguments.
OUTPUT
------
View
18 git-check-attr.html
@@ -326,7 +326,7 @@
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>For every pathname, this command will list if each attr is <em>unspecified</em>,
+<div class="para"><p>For every pathname, this command will list if each attribute is <em>unspecified</em>,
<em>set</em>, or <em>unset</em> as a gitattribute on that pathname.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
@@ -345,8 +345,8 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Only meaningful with <tt>--stdin</tt>; paths are separated with
- NUL character instead of LF.
+ Only meaningful with <tt>--stdin</tt>; paths are separated with a
+ NUL character instead of a linefeed character.
</p>
</dd>
<dt>
@@ -354,7 +354,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Interpret all preceding arguments as attributes, and all following
+ Interpret all preceding arguments as attributes and all following
arguments as path names. If not supplied, only the first argument will
be treated as an attribute.
</p>
@@ -365,7 +365,7 @@ <h2 id="_output">OUTPUT</h2>
<div class="sectionbody">
<div class="para"><p>The output is of the form:
&lt;path&gt; COLON SP &lt;attribute&gt; COLON SP &lt;info&gt; LF</p></div>
-<div class="para"><p>Where &lt;path&gt; is the path of a file being queried, &lt;attribute&gt; is an attribute
+<div class="para"><p>&lt;path&gt; is the path of a file being queried, &lt;attribute&gt; is an attribute
being queried and &lt;info&gt; can be either:</p></div>
<div class="hlist"><table>
<tr>
@@ -381,7 +381,7 @@ <h2 id="_output">OUTPUT</h2>
<em>unset</em>
</td>
<td class="hlist2">
-when the attribute is defined to false.
+when the attribute is defined as false.
</td>
</tr>
<tr>
@@ -389,7 +389,7 @@ <h2 id="_output">OUTPUT</h2>
<em>set</em>
</td>
<td class="hlist2">
-when the attribute is defined to true.
+when the attribute is defined as true.
</td>
</tr>
<tr>
@@ -440,7 +440,7 @@ <h2 id="_examples">EXAMPLES</h2>
<div class="ilist"><ul>
<li>
<p>
-Listing attribute for multiple files:
+Listing an attribute for multiple files:
</p>
</li>
</ul></div>
@@ -481,7 +481,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:05 UTC
+Last updated 2009-03-26 08:39:12 UTC
</div>
</div>
</body>
View
16 git-check-attr.txt
@@ -14,7 +14,7 @@ SYNOPSIS
DESCRIPTION
-----------
-For every pathname, this command will list if each attr is 'unspecified',
+For every pathname, this command will list if each attribute is 'unspecified',
'set', or 'unset' as a gitattribute on that pathname.
OPTIONS
@@ -23,11 +23,11 @@ OPTIONS
Read file names from stdin instead of from the command-line.
-z::
- Only meaningful with `--stdin`; paths are separated with
- NUL character instead of LF.
+ Only meaningful with `--stdin`; paths are separated with a
+ NUL character instead of a linefeed character.
\--::
- Interpret all preceding arguments as attributes, and all following
+ Interpret all preceding arguments as attributes and all following
arguments as path names. If not supplied, only the first argument will
be treated as an attribute.
@@ -37,12 +37,12 @@ OUTPUT
The output is of the form:
<path> COLON SP <attribute> COLON SP <info> LF
-Where <path> is the path of a file being queried, <attribute> is an attribute
+<path> is the path of a file being queried, <attribute> is an attribute
being queried and <info> can be either:
'unspecified';; when the attribute is not defined for the path.
-'unset';; when the attribute is defined to false.
-'set';; when the attribute is defined to true.
+'unset';; when the attribute is defined as false.
+'set';; when the attribute is defined as true.
<value>;; when a value has been assigned to the attribute.
EXAMPLES
@@ -69,7 +69,7 @@ org/example/MyClass.java: diff: java
org/example/MyClass.java: myAttr: set
---------------
-* Listing attribute for multiple files:
+* Listing an attribute for multiple files:
---------------
$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java
org/example/MyClass.java: myAttr: set
View
42 git-check-ref-format.html
@@ -314,7 +314,7 @@
<h2>NAME</h2>
<div class="sectionbody">
<p>git-check-ref-format -
- Make sure ref name is well formed
+ Ensures that a reference name is well formed
</p>
</div>
</div>
@@ -324,60 +324,60 @@
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Checks if a given <em>refname</em> is acceptable, and exits non-zero if
-it is not.</p></div>
+<div class="para"><p>Checks if a given <em>refname</em> is acceptable, and exits with a non-zero
+status if it is not.</p></div>
<div class="para"><p>A reference is used in git to specify branches and tags. A
-branch head is stored under <tt>$GIT_DIR/refs/heads</tt> directory, and
-a tag is stored under <tt>$GIT_DIR/refs/tags</tt> directory. git
-imposes the following rules on how refs are named:</p></div>
+branch head is stored under the <tt>$GIT_DIR/refs/heads</tt> directory, and
+a tag is stored under the <tt>$GIT_DIR/refs/tags</tt> directory. git
+imposes the following rules on how references are named:</p></div>
<div class="olist"><ol>
<li>
<p>
-It can include slash <tt>/</tt> for hierarchical (directory)
+They can include slash <tt>/</tt> for hierarchical (directory)
grouping, but no slash-separated component can begin with a
- dot <tt>.</tt>;
+ dot <tt>.</tt>.
</p>
</li>
<li>
<p>
-It cannot have two consecutive dots <tt>..</tt> anywhere;
+They cannot have two consecutive dots <tt>..</tt> anywhere.
</p>
</li>
<li>
<p>
-It cannot have ASCII control character (i.e. bytes whose
+They cannot have ASCII control characters (i.e. bytes whose
values are lower than \040, or \177 <tt>DEL</tt>), space, tilde <tt>~</tt>,
caret <tt>&#94;</tt>, colon <tt>:</tt>, question-mark <tt>?</tt>, asterisk <tt>*</tt>,
- or open bracket <tt>[</tt> anywhere;
+ or open bracket <tt>[</tt> anywhere.
</p>
</li>
<li>
<p>
-It cannot end with a slash <tt>/</tt>.
+They cannot end with a slash <tt>/</tt>.
</p>
</li>
</ol></div>
-<div class="para"><p>These rules makes it easy for shell script based tools to parse
-refnames, pathname expansion by the shell when a refname is used
+<div class="para"><p>These rules make it easy for shell script based tools to parse
+reference names, pathname expansion by the shell when a reference name is used
unquoted (by mistake), and also avoids ambiguities in certain
-refname expressions (see <a href="git-rev-parse.html">git-rev-parse(1)</a>). Namely:</p></div>
+reference name expressions (see <a href="git-rev-parse.html">git-rev-parse(1)</a>):</p></div>
<div class="olist"><ol>
<li>
<p>
-double-dot <tt>..</tt> are often used as in <tt>ref1..ref2</tt>, and in some
- context this notation means <tt>&#94;ref1 ref2</tt> (i.e. not in
- ref1 and in ref2).
+A double-dot <tt>..</tt> is often used as in <tt>ref1..ref2</tt>, and in some
+ contexts this notation means <tt>&#94;ref1 ref2</tt> (i.e. not in
+ <tt>ref1</tt> and in <tt>ref2</tt>).
</p>
</li>
<li>
<p>
-tilde <tt>~</tt> and caret <tt>&#94;</tt> are used to introduce postfix
+A tilde <tt>~</tt> and caret <tt>&#94;</tt> are used to introduce the postfix
<em>nth parent</em> and <em>peel onion</em> operation.
</p>
</li>
<li>
<p>
-colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
+A colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
value and store it in dstref" in fetch and push operations.
It may also be used to select a specific object such as with
'git-cat-file': "git cat-file blob v1.3.3:refs.c".
@@ -391,7 +391,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:06 UTC
+Last updated 2009-03-26 08:39:13 UTC
</div>
</div>
</body>
View
40 git-check-ref-format.txt
@@ -3,7 +3,7 @@ git-check-ref-format(1)
NAME
----
-git-check-ref-format - Make sure ref name is well formed
+git-check-ref-format - Ensures that a reference name is well formed
SYNOPSIS
--------
@@ -11,40 +11,40 @@ SYNOPSIS
DESCRIPTION
-----------
-Checks if a given 'refname' is acceptable, and exits non-zero if
-it is not.
+Checks if a given 'refname' is acceptable, and exits with a non-zero
+status if it is not.
A reference is used in git to specify branches and tags. A
-branch head is stored under `$GIT_DIR/refs/heads` directory, and
-a tag is stored under `$GIT_DIR/refs/tags` directory. git
-imposes the following rules on how refs are named:
+branch head is stored under the `$GIT_DIR/refs/heads` directory, and
+a tag is stored under the `$GIT_DIR/refs/tags` directory. git
+imposes the following rules on how references are named:
-. It can include slash `/` for hierarchical (directory)
+. They can include slash `/` for hierarchical (directory)
grouping, but no slash-separated component can begin with a
- dot `.`;
+ dot `.`.
-. It cannot have two consecutive dots `..` anywhere;
+. They cannot have two consecutive dots `..` anywhere.
-. It cannot have ASCII control character (i.e. bytes whose
+. They cannot have ASCII control characters (i.e. bytes whose
values are lower than \040, or \177 `DEL`), space, tilde `~`,
caret `{caret}`, colon `:`, question-mark `?`, asterisk `*`,
- or open bracket `[` anywhere;
+ or open bracket `[` anywhere.
-. It cannot end with a slash `/`.
+. They cannot end with a slash `/`.
-These rules makes it easy for shell script based tools to parse
-refnames, pathname expansion by the shell when a refname is used
+These rules make it easy for shell script based tools to parse
+reference names, pathname expansion by the shell when a reference name is used
unquoted (by mistake), and also avoids ambiguities in certain
-refname expressions (see linkgit:git-rev-parse[1]). Namely:
+reference name expressions (see linkgit:git-rev-parse[1]):
-. double-dot `..` are often used as in `ref1..ref2`, and in some
- context this notation means `{caret}ref1 ref2` (i.e. not in
- ref1 and in ref2).
+. A double-dot `..` is often used as in `ref1..ref2`, and in some
+ contexts this notation means `{caret}ref1 ref2` (i.e. not in
+ `ref1` and in `ref2`).
-. tilde `~` and caret `{caret}` are used to introduce postfix
+. A tilde `~` and caret `{caret}` are used to introduce the postfix
'nth parent' and 'peel onion' operation.
-. colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
+. A colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
value and store it in dstref" in fetch and push operations.
It may also be used to select a specific object such as with
'git-cat-file': "git cat-file blob v1.3.3:refs.c".
View
41 git-config.html
@@ -2824,6 +2824,45 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
</p>
</dd>
<dt>
+push.default
+</dt>
+<dd>
+<p>
+ Defines the action git push should take if no refspec is given
+ on the command line, no refspec is configured in the remote, and
+ no refspec is implied by any of the options given on the command
+ line.
+</p>
+<div class="para"><p>The term <tt>current remote</tt> means the remote configured for the current
+branch, or <tt>origin</tt> if no remote is configured. <tt>origin</tt> is also used
+if you are not on any branch. Possible values are:</p></div>
+<div class="ilist"><ul>
+<li>
+<p>
+<tt>nothing</tt> do not push anything.
+</p>
+</li>
+<li>
+<p>
+<tt>matching</tt> push all matching branches to the current remote.
+ All branches having the same name in both ends are considered to be
+ matching. This is the current default value.
+</p>
+</li>
+<li>
+<p>
+<tt>tracking</tt> push the current branch to the branch it is tracking.
+</p>
+</li>
+<li>
+<p>
+<tt>current</tt> push the current branch to a branch of the same name on the
+ current remote.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt>
rebase.stat
</dt>
<dd>
@@ -3168,7 +3207,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-21 00:39:07 UTC
+Last updated 2009-03-26 08:39:13 UTC
</div>
</div>
</body>
View
4 git-cvsimport.html
@@ -396,7 +396,7 @@ <h2 id="_options">OPTIONS</h2>
<p>
The git remote to import this CVS repository into.
Moves all CVS branches into remotes/&lt;remote&gt;/&lt;branch&gt;
- akin to the <em>git-clone</em> "--use-separate-remote" option.
+ akin to the way <em>git-clone</em> uses <em>origin</em> by default.
</p>
</dd>
<dt>
@@ -651,7 +651,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-25 18:49:19 UTC
+Last updated 2009-03-26 08:39:13 UTC
</div>
</div>
</body>
View
2  git-cvsimport.txt
@@ -65,7 +65,7 @@ OPTIONS
-r <remote>::
The git remote to import this CVS repository into.
Moves all CVS branches into remotes/<remote>/<branch>
- akin to the 'git-clone' "--use-separate-remote" option.
+ akin to the way 'git-clone' uses 'origin' by default.
-o <branch-for-HEAD>::
When no remote is specified (via -r) the 'HEAD' branch
View
18 git-merge.html
@@ -516,7 +516,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<dd>
<p>
This can only resolve two heads (i.e. the current branch
- and another branch you pulled from) using 3-way merge
+ and another branch you pulled from) using a 3-way merge
algorithm. It tries to carefully detect criss-cross
merge ambiguities and is considered generally safe and
fast.
@@ -527,9 +527,9 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This can only resolve two heads using 3-way merge
- algorithm. When there are more than one common
- ancestors that can be used for 3-way merge, it creates a
+ This can only resolve two heads using a 3-way merge
+ algorithm. When there is more than one common
+ ancestor that can be used for 3-way merge, it creates a
merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without
@@ -545,11 +545,11 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This resolves more than two-head case, but refuses to do
- complex merge that needs manual resolution. It is
+ This resolves cases with more than two heads, but refuses to do
+ a complex merge that needs manual resolution. It is
primarily meant to be used for bundling topic branch
heads together. This is the default merge strategy when
- pulling or merging more than one branches.
+ pulling or merging more than one branch.
</p>
</dd>
<dt>
@@ -577,7 +577,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dd>
</dl></div>
<div class="para"><p>If you tried a merge which resulted in a complex conflicts and
-would want to start over, you can recover with <em>git-reset</em>.</p></div>
+want to start over, you can recover with <em>git-reset</em>.</p></div>
</div>
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
@@ -920,7 +920,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-18 01:54:21 UTC
+Last updated 2009-03-26 08:39:13 UTC
</div>
</div>
</body>
View
2  git-merge.txt
@@ -41,7 +41,7 @@ include::merge-strategies.txt[]
If you tried a merge which resulted in a complex conflicts and
-would want to start over, you can recover with 'git-reset'.
+want to start over, you can recover with 'git-reset'.
CONFIGURATION
-------------
View
4 git-patch-id.html
@@ -331,7 +331,7 @@ <h2 id="_description">DESCRIPTION</h2>
<div class="para"><p>IOW, you can use this thing to look for likely duplicate commits.</p></div>
<div class="para"><p>When dealing with <em>git-diff-tree</em> output, it takes advantage of
the fact that the patch is prefixed with the object name of the
-commit, and outputs two 40-byte hexadecimal string. The first
+commit, and outputs two 40-byte hexadecimal strings. The first
string is the patch ID, and the second string is the commit ID.
This can be used to make a mapping from patch ID to commit ID.</p></div>
</div>
@@ -362,7 +362,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:28 UTC
+Last updated 2009-03-26 08:39:14 UTC
</div>
</div>
</body>
View
2  git-patch-id.txt
@@ -20,7 +20,7 @@ IOW, you can use this thing to look for likely duplicate commits.
When dealing with 'git-diff-tree' output, it takes advantage of
the fact that the patch is prefixed with the object name of the
-commit, and outputs two 40-byte hexadecimal string. The first
+commit, and outputs two 40-byte hexadecimal strings. The first
string is the patch ID, and the second string is the commit ID.
This can be used to make a mapping from patch ID to commit ID.
View
16 git-pull.html
@@ -952,7 +952,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<dd>
<p>
This can only resolve two heads (i.e. the current branch
- and another branch you pulled from) using 3-way merge
+ and another branch you pulled from) using a 3-way merge
algorithm. It tries to carefully detect criss-cross
merge ambiguities and is considered generally safe and
fast.
@@ -963,9 +963,9 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This can only resolve two heads using 3-way merge
- algorithm. When there are more than one common
- ancestors that can be used for 3-way merge, it creates a
+ This can only resolve two heads using a 3-way merge
+ algorithm. When there is more than one common
+ ancestor that can be used for 3-way merge, it creates a
merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without
@@ -981,11 +981,11 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This resolves more than two-head case, but refuses to do
- complex merge that needs manual resolution. It is
+ This resolves cases with more than two heads, but refuses to do
+ a complex merge that needs manual resolution. It is
primarily meant to be used for bundling topic branch
heads together. This is the default merge strategy when
- pulling or merging more than one branches.
+ pulling or merging more than one branch.
</p>
</dd>
<dt>
@@ -1176,7 +1176,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:29 UTC
+Last updated 2009-03-26 08:39:14 UTC
</div>
</div>
</body>
View
16 git-rebase.html
@@ -718,7 +718,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<dd>
<p>
This can only resolve two heads (i.e. the current branch
- and another branch you pulled from) using 3-way merge
+ and another branch you pulled from) using a 3-way merge
algorithm. It tries to carefully detect criss-cross
merge ambiguities and is considered generally safe and
fast.
@@ -729,9 +729,9 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This can only resolve two heads using 3-way merge
- algorithm. When there are more than one common
- ancestors that can be used for 3-way merge, it creates a
+ This can only resolve two heads using a 3-way merge
+ algorithm. When there is more than one common
+ ancestor that can be used for 3-way merge, it creates a
merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without
@@ -747,11 +747,11 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This resolves more than two-head case, but refuses to do
- complex merge that needs manual resolution. It is
+ This resolves cases with more than two heads, but refuses to do
+ a complex merge that needs manual resolution. It is
primarily meant to be used for bundling topic branch
heads together. This is the default merge strategy when
- pulling or merging more than one branches.
+ pulling or merging more than one branch.
</p>
</dd>
<dt>
@@ -1117,7 +1117,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-19 17:47:41 UTC
+Last updated 2009-03-26 08:39:14 UTC
</div>
</div>
</body>
View
6 git.html
@@ -1216,7 +1216,7 @@ <h3 id="_interrogation_commands">Interrogation commands</h3><div style="clear:le
</dt>
<dd>
<p>
- Provide content or type/size information for repository objects.
+ Provide content or type and size information for repository objects.
</p>
</dd>
<dt>
@@ -1470,7 +1470,7 @@ <h3 id="_internal_helper_commands">Internal helper commands</h3><div style="clea
</dt>
<dd>
<p>
- Make sure ref name is well formed.
+ Ensures that a reference name is well formed.
</p>
</dd>
<dt>
@@ -2025,7 +2025,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-22 08:21:22 UTC
+Last updated 2009-03-26 08:39:15 UTC
</div>
</div>
</body>
View
14 merge-strategies.txt
@@ -3,15 +3,15 @@ MERGE STRATEGIES
resolve::
This can only resolve two heads (i.e. the current branch
- and another branch you pulled from) using 3-way merge
+ and another branch you pulled from) using a 3-way merge
algorithm. It tries to carefully detect criss-cross
merge ambiguities and is considered generally safe and
fast.
recursive::
- This can only resolve two heads using 3-way merge
- algorithm. When there are more than one common
- ancestors that can be used for 3-way merge, it creates a
+ This can only resolve two heads using a 3-way merge
+ algorithm. When there is more than one common
+ ancestor that can be used for 3-way merge, it creates a
merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without
@@ -22,11 +22,11 @@ recursive::
pulling or merging one branch.
octopus::
- This resolves more than two-head case, but refuses to do
- complex merge that needs manual resolution. It is
+ This resolves cases with more than two heads, but refuses to do
+ a complex merge that needs manual resolution. It is
primarily meant to be used for bundling topic branch
heads together. This is the default merge strategy when
- pulling or merging more than one branches.
+ pulling or merging more than one branch.
ours::
This resolves any number of heads, but the result of the

0 comments on commit 1de7572

Please sign in to comment.
Something went wrong with that request. Please try again.