Skip to content

Commit dca3482

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.7.0
1 parent 1123f30 commit dca3482

186 files changed

Lines changed: 195 additions & 185 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎RelNotes-1.6.6.2.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Git v1.6.6.2 Release Notes
22
==========================
33

4-
Fixes since v1.6.6.2
4+
Fixes since v1.6.6.1
55
--------------------
66

77
* recursive merge didn't correctly diagnose its own programming errors,

‎RelNotes-1.7.0.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ Updates since v1.6.6
106106
defaults to the current branch, so "git fetch && git merge @{upstream}"
107107
will be equivalent to "git pull".
108108

109+
* "git am --resolved" has a synonym "git am --continue".
110+
109111
* "git branch --set-upstream" can be used to update the (surprise!) upstream,
110112
i.e. where the branch is supposed to pull and merge from (or rebase onto).
111113

@@ -200,6 +202,9 @@ release, unless otherwise noted.
200202
the branch is fully merged to its upstream branch if it is not merged
201203
to the current branch. It now deletes it in such a case.
202204

205+
* "fiter-branch" command incorrectly said --prune-empty and --filter-commit
206+
were incompatible; the latter should be read as --commit-filter.
207+
203208
* When using "git status" or asking "git diff" to compare the work tree
204209
with something, they used to consider that a checked-out submodule with
205210
uncommitted changes is not modified; this could cause people to forget

‎everyday.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ <h3 id="_examples_5">Examples</h3><div style="clear:left"></div>
10981098
</div>
10991099
<div id="footer">
11001100
<div id="footer-text">
1101-
Last updated 2009-12-03 09:12:56 UTC
1101+
Last updated 2010-02-13 01:00:05 UTC
11021102
</div>
11031103
</div>
11041104
</body>

‎git-add.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ <h2 id="_git">GIT</h2>
721721
</div>
722722
<div id="footer">
723723
<div id="footer-text">
724-
Last updated 2010-02-09 07:33:56 UTC
724+
Last updated 2010-02-13 00:59:33 UTC
725725
</div>
726726
</div>
727727
</body>

‎git-am.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ <h2 id="_git">GIT</h2>
639639
</div>
640640
<div id="footer">
641641
<div id="footer-text">
642-
Last updated 2010-02-12 08:07:54 UTC
642+
Last updated 2010-02-13 00:59:33 UTC
643643
</div>
644644
</div>
645645
</body>

‎git-annotate.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ <h2 id="_git">GIT</h2>
551551
</div>
552552
<div id="footer">
553553
<div id="footer-text">
554-
Last updated 2010-01-17 02:43:49 UTC
554+
Last updated 2010-02-13 00:59:34 UTC
555555
</div>
556556
</div>
557557
</body>

‎git-apply.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ <h2 id="_git">GIT</h2>
729729
</div>
730730
<div id="footer">
731731
<div id="footer-text">
732-
Last updated 2010-01-21 17:44:21 UTC
732+
Last updated 2010-02-13 00:59:34 UTC
733733
</div>
734734
</div>
735735
</body>

‎git-archimport.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ <h2 id="_git">GIT</h2>
470470
</div>
471471
<div id="footer">
472472
<div id="footer-text">
473-
Last updated 2010-01-21 17:44:21 UTC
473+
Last updated 2010-02-13 00:59:34 UTC
474474
</div>
475475
</div>
476476
</body>

‎git-archive.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ <h2 id="_git">GIT</h2>
592592
</div>
593593
<div id="footer">
594594
<div id="footer-text">
595-
Last updated 2010-02-12 20:51:08 UTC
595+
Last updated 2010-02-13 00:59:34 UTC
596596
</div>
597597
</div>
598598
</body>

‎git-bisect-lk2009.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ <h2 id="_references">References</h2>
14721472
</div>
14731473
<div id="footer">
14741474
<div id="footer-text">
1475-
Last updated 2010-01-31 23:03:59 UTC
1475+
Last updated 2010-02-13 01:00:05 UTC
14761476
</div>
14771477
</div>
14781478
</body>

0 commit comments

Comments
 (0)