Git 1.7.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 12, 2010 at 15:45 UTC
e923eaeb901ff056421b9007adcbbce271caa7b6
3 files changed
+11
-1
Documentation/RelNotes-1.7.0.txt
+5
@@ -106,6 +106,8 @@ Updates since v1.6.6
106
defaults to the current branch, so "git fetch && git merge @{upstream}"
107
will be equivalent to "git pull".
108
109
+ * "git am --resolved" has a synonym "git am --continue".
110
+
111
* "git branch --set-upstream" can be used to update the (surprise!) upstream,
112
i.e. where the branch is supposed to pull and merge from (or rebase onto).
113
@@ -200,6 +202,9 @@ release, unless otherwise noted.
202
the branch is fully merged to its upstream branch if it is not merged
203
to the current branch. It now deletes it in such a case.
204
205
+ * "fiter-branch" command incorrectly said --prune-empty and --filter-commit
206
+ were incompatible; the latter should be read as --commit-filter.
207
+
208
* When using "git status" or asking "git diff" to compare the work tree
209
with something, they used to consider that a checked-out submodule with
210
uncommitted changes is not modified; this could cause people to forget
Documentation/git.txt
+5
@@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master'
43
branch of the `git.git` repository.
44
Documentation for older releases are available here:
45
46
+* link:v1.7.0/git.html[documentation for release 1.7.0]
47
+
48
+* release notes for
49
+ link:RelNotes-1.7.0.txt[1.7.0].
50
+
51
* link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
52
53
* release notes for
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.6.6.GIT
4
+DEF_VER=v1.7.0
5
6
LF='
7
'