Update draft release notes to 1.7.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 22, 2010 at 16:34 UTC
c2c2be137ac491c17c4fe1fdd27b6a8ac5c1e6c6
1 file changed
+26
-1
Documentation/RelNotes-1.7.0.txt
+26
-1
@@ -82,6 +82,14 @@ Updates since v1.6.6
82
contents (e.g. git-merge documentation) have strings that resemble the
83
conflict markers.
84
85
+ * A new syntax "<branch>@{upstream}" can be used on the command line to
86
+ substitute the name of the "upstream" of the branch. Missing branch
87
+ defaults to the current branch, so "git fetch && git merge @{upstream}"
88
+ will be equivalent to "git pull".
89
+
90
+ * "git branch --set-upstream" can be used to update the (surprise!) upstream
91
+ i.e. where the branch is supposed to pull and merge from (or rebase onto).
92
+
93
* "git checkout A...B" is a way to detach HEAD at the merge base between
94
A and B.
95
@@ -110,6 +118,9 @@ Updates since v1.6.6
118
* "git grep" learned "--no-index" option, to search inside contents that
119
are not managed by git.
120
121
+ * "git log" and friends learned "--glob=heads/*" syntax that is a more
122
+ flexible way to complement "--branches/--tags/--remotes".
123
+
124
* "git merge" learned to pass options specific to strategy-backends. E.g.
125
126
- "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
@@ -135,6 +146,9 @@ Updates since v1.6.6
146
* "git rebase -i" also learned --autosquash option, that is useful
147
together with the new "fixup" action.
148
149
+ * "git remote" learned set-url subcommand, to update (surprise!) url
150
+ for an existing remote nickname.
151
+
152
* "git rerere" learned "forget path" subcommand. Together with "git
153
checkout -m path" it will be useful when you recorded a wrong
154
resolution.
@@ -152,6 +166,7 @@ Updates since v1.6.6
166
167
* The infrastructure to build foreign SCM interface has been updated.
168
169
+ * Many more commands are now built-in.
170
171
Fixes since v1.6.6
172
------------------
@@ -159,8 +174,18 @@ Fixes since v1.6.6
174
All of the fixes in v1.6.6.X maintenance series are included in this
175
release, unless otherwise noted.
176
177
+ * "git branch -d branch" used to refuse deleting the branch even when
178
+ the branch is fully merged to its upstream branch if it is not merged
179
+ to the current branch. It now deletes it in such a case.
180
+
181
+ * When "git diff" is asked to compare the work tree with something,
182
+ it used to consider that a checked-out submodule with uncommitted
183
+ changes is not modified; this could cause people to forget committing
184
+ these changes in the submodule before committing in the superproject.
185
+ It now considers such a change as a modification.
186
+
187
--
188
exec >/var/tmp/1
164
-O=v1.6.6.1-379-gd4556c4
189
+O=v1.6.6.1-434-g3521c1b
190
echo O=$(git describe master)
191
git shortlog --no-merges $O..master ^maint