Skip to content

Commit 27a128b

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.4-122-g6ffd7
1 parent 9f88386 commit 27a128b

21 files changed

+192
-34
lines changed

‎config.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ color.interactive.<slot>::
605605
Use customized color for 'git-add --interactive'
606606
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
607607
four distinct types of normal output from interactive
608-
programs. The values of these variables may be specified as
608+
commands. The values of these variables may be specified as
609609
in color.branch.<slot>.
610610

611611
color.pager::
@@ -1113,7 +1113,7 @@ instaweb.port::
11131113
linkgit:git-instaweb[1].
11141114

11151115
interactive.singlekey::
1116-
In interactive programs, allow the user to provide one-letter
1116+
In interactive commands, allow the user to provide one-letter
11171117
input with a single key (i.e., without hitting enter).
11181118
Currently this is used only by the `\--patch` mode of
11191119
linkgit:git-add[1]. Note that this setting is silently

‎fetch-options.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-q::
22
--quiet::
33
Pass --quiet to git-fetch-pack and silence any other internally
4-
used programs.
4+
used git commands.
55

66
-v::
77
--verbose::

‎git-add.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ <h2>SYNOPSIS</h2>
323323
<div class="verseblock">
324324
<div class="content"><em>git add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
325325
[--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
326-
[--refresh] [--ignore-errors] [--] &lt;filepattern&gt;&#8230;</div></div>
326+
[--refresh] [--ignore-errors] [--] [&lt;filepattern&gt;&#8230;]</div></div>
327327
</div>
328328
<h2 id="_description">DESCRIPTION</h2>
329329
<div class="sectionbody">
@@ -710,7 +710,7 @@ <h2 id="_git">GIT</h2>
710710
</div>
711711
<div id="footer">
712712
<div id="footer-text">
713-
Last updated 2009-07-01 02:30:41 UTC
713+
Last updated 2009-08-13 01:22:24 UTC
714714
</div>
715715
</div>
716716
</body>

‎git-add.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SYNOPSIS
1010
[verse]
1111
'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
1212
[--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
13-
[--refresh] [--ignore-errors] [--] <filepattern>...
13+
[--refresh] [--ignore-errors] [--] [<filepattern>...]
1414

1515
DESCRIPTION
1616
-----------

‎git-config.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
16091609
Use customized color for <em>git-add --interactive</em>
16101610
output. <tt>&lt;slot&gt;</tt> may be <tt>prompt</tt>, <tt>header</tt>, <tt>help</tt> or <tt>error</tt>, for
16111611
four distinct types of normal output from interactive
1612-
programs. The values of these variables may be specified as
1612+
commands. The values of these variables may be specified as
16131613
in color.branch.&lt;slot&gt;.
16141614
</p>
16151615
</dd>
@@ -2590,7 +2590,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
25902590
</dt>
25912591
<dd>
25922592
<p>
2593-
In interactive programs, allow the user to provide one-letter
2593+
In interactive commands, allow the user to provide one-letter
25942594
input with a single key (i.e., without hitting enter).
25952595
Currently this is used only by the <tt>--patch</tt> mode of
25962596
<a href="git-add.html">git-add(1)</a>. Note that this setting is silently
@@ -3470,7 +3470,7 @@ <h2 id="_git">GIT</h2>
34703470
</div>
34713471
<div id="footer">
34723472
<div id="footer-text">
3473-
Last updated 2009-08-11 06:23:33 UTC
3473+
Last updated 2009-08-13 01:22:24 UTC
34743474
</div>
34753475
</div>
34763476
</body>

‎git-fetch.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ <h2 id="_options">OPTIONS</h2>
349349
<dd>
350350
<p>
351351
Pass --quiet to git-fetch-pack and silence any other internally
352-
used programs.
352+
used git commands.
353353
</p>
354354
</dd>
355355
<dt>
@@ -789,7 +789,7 @@ <h2 id="_git">GIT</h2>
789789
</div>
790790
<div id="footer">
791791
<div id="footer-text">
792-
Last updated 2009-07-01 02:30:50 UTC
792+
Last updated 2009-08-13 01:22:25 UTC
793793
</div>
794794
</div>
795795
</body>

‎git-merge.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ <h2>SYNOPSIS</h2>
322322
<div class="sectionbody">
323323
<div class="verseblock">
324324
<div class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;
325-
[-m &lt;msg&gt;] &lt;remote&gt; &lt;remote&gt;&#8230;
325+
[-m &lt;msg&gt;] &lt;remote&gt;&#8230;
326326
<em>git merge</em> &lt;msg&gt; HEAD &lt;remote&gt;&#8230;</div></div>
327327
</div>
328328
<h2 id="_description">DESCRIPTION</h2>
@@ -922,7 +922,7 @@ <h2 id="_git">GIT</h2>
922922
</div>
923923
<div id="footer">
924924
<div id="footer-text">
925-
Last updated 2009-07-01 02:30:56 UTC
925+
Last updated 2009-08-13 01:22:25 UTC
926926
</div>
927927
</div>
928928
</body>

‎git-merge.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SYNOPSIS
1010
--------
1111
[verse]
1212
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
13-
[-m <msg>] <remote> <remote>...
13+
[-m <msg>] <remote>...
1414
'git merge' <msg> HEAD <remote>...
1515

1616
DESCRIPTION

‎git-pull.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ <h2 id="_options">OPTIONS</h2>
529529
<dd>
530530
<p>
531531
Pass --quiet to git-fetch-pack and silence any other internally
532-
used programs.
532+
used git commands.
533533
</p>
534534
</dd>
535535
<dt>
@@ -1180,7 +1180,7 @@ <h2 id="_git">GIT</h2>
11801180
</div>
11811181
<div id="footer">
11821182
<div id="footer-text">
1183-
Last updated 2009-07-01 02:30:58 UTC
1183+
Last updated 2009-08-13 01:22:26 UTC
11841184
</div>
11851185
</div>
11861186
</body>

‎git-push.html‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,78 @@ <h2 id="_output">OUTPUT</h2>
791791
</dd>
792792
</dl></div>
793793
</div>
794+
<h2 id="_note_about_fast_forwards">Note about fast-forwards</h2>
795+
<div class="sectionbody">
796+
<div class="para"><p>When an update changes a branch (or more in general, a ref) that used to
797+
point at commit A to point at another commit B, it is called a
798+
fast-forward update if and only if B is a descendant of A.</p></div>
799+
<div class="para"><p>In a fast-forward update from A to B, the set of commits that the original
800+
commit A built on top of is a subset of the commits the new commit B
801+
builds on top of. Hence, it does not lose any history.</p></div>
802+
<div class="para"><p>In contrast, a non-fast-forward update will lose history. For example,
803+
suppose you and somebody else started at the same commit X, and you built
804+
a history leading to commit B while the other person built a history
805+
leading to commit A. The history looks like this:</p></div>
806+
<div class="listingblock">
807+
<div class="content">
808+
<pre><tt>
809+
B
810+
/
811+
---X---A
812+
</tt></pre>
813+
</div></div>
814+
<div class="para"><p>Further suppose that the other person already pushed changes leading to A
815+
back to the original repository you two obtained the original commit X.</p></div>
816+
<div class="para"><p>The push done by the other person updated the branch that used to point at
817+
commit X to point at commit A. It is a fast-forward.</p></div>
818+
<div class="para"><p>But if you try to push, you will attempt to update the branch (that
819+
now points at A) with commit B. This does _not_ fast-forward. If you did
820+
so, the changes introduced by commit A will be lost, because everybody
821+
will now start building on top of B.</p></div>
822+
<div class="para"><p>The command by default does not allow an update that is not a fast-forward
823+
to prevent such loss of history.</p></div>
824+
<div class="para"><p>If you do not want to lose your work (history from X to B) nor the work by
825+
the other person (history from X to A), you would need to first fetch the
826+
history from the repository, create a history that contains changes done
827+
by both parties, and push the result back.</p></div>
828+
<div class="para"><p>You can perform "git pull", resolve potential conflicts, and "git push"
829+
the result. A "git pull" will create a merge commit C between commits A
830+
and B.</p></div>
831+
<div class="listingblock">
832+
<div class="content">
833+
<pre><tt>
834+
B---C
835+
/ /
836+
---X---A
837+
</tt></pre>
838+
</div></div>
839+
<div class="para"><p>Updating A with the resulting merge commit will fast-forward and your
840+
push will be accepted.</p></div>
841+
<div class="para"><p>Alternatively, you can rebase your change between X and B on top of A,
842+
with "git pull --rebase", and push the result back. The rebase will
843+
create a new commit D that builds the change between X and B on top of
844+
A.</p></div>
845+
<div class="listingblock">
846+
<div class="content">
847+
<pre><tt>
848+
B D
849+
/ /
850+
---X---A
851+
</tt></pre>
852+
</div></div>
853+
<div class="para"><p>Again, updating A with this commit will fast-forward and your push will be
854+
accepted.</p></div>
855+
<div class="para"><p>There is another common situation where you may encounter non-fast-forward
856+
rejection when you try to push, and it is possible even when you are
857+
pushing into a repository nobody else pushes into. After you push commit
858+
A yourself (in the first picture in this section), replace it with "git
859+
commit --amend" to produce commit B, and you try to push it out, because
860+
forgot that you have pushed A out already. In such a case, and only if
861+
you are certain that nobody in the meantime fetched your earlier commit A
862+
(and started building on top of it), you can run "git push --force" to
863+
overwrite it. In other words, "git push --force" is a method reserved for
864+
a case where you do mean to lose history.</p></div>
865+
</div>
794866
<h2 id="_examples">Examples</h2>
795867
<div class="sectionbody">
796868
<div class="vlist"><dl>
@@ -936,7 +1008,7 @@ <h2 id="_git">GIT</h2>
9361008
</div>
9371009
<div id="footer">
9381010
<div id="footer-text">
939-
Last updated 2009-07-09 16:48:59 UTC
1011+
Last updated 2009-08-13 01:22:27 UTC
9401012
</div>
9411013
</div>
9421014
</body>

0 commit comments

Comments
 (0)