Documentation: minor fixes to RelNotes-1.7.0
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Feb 12, 2010 at 10:47 UTC
f93742170248127eec46e6d1afc65da2919480db
1 file changed
+8
-8
Documentation/RelNotes-1.7.0.txt
+8
-8
@@ -4,7 +4,7 @@ Git v1.7.0 Release Notes
4
Notes on behaviour change
5
-------------------------
6
7
- * "git push" into a branch that is currently checked out (i.e. pointed by
7
+ * "git push" into a branch that is currently checked out (i.e. pointed at by
8
HEAD in a repository that is not bare) is refused by default.
9
10
Similarly, "git push $there :$killed" to delete the branch $killed
@@ -19,7 +19,7 @@ Notes on behaviour change
19
patch series with more than two messages. All messages will be sent
20
as a reply to the first message, i.e. cover letter.
21
22
- It has been possible to configure send-email to send "shallow thread"
22
+ It has been possible already to configure send-email to send "shallow thread"
23
by setting sendemail.chainreplyto configuration variable to false. The
24
only thing this release does is to change the default when you haven't
25
configured that variable.
@@ -30,7 +30,7 @@ Notes on behaviour change
30
* "git diff" traditionally treated various "ignore whitespace" options
31
only as a way to filter the patch output. "git diff --exit-code -b"
32
exited with non-zero status even if all changes were about changing the
33
- ammount of whitespace and nothing else. and "git diff -b" showed the
33
+ amount of whitespace and nothing else; and "git diff -b" showed the
34
"diff --git" header line for such a change without patch text.
35
36
In this release, the "ignore whitespaces" options affect the semantics
@@ -106,7 +106,7 @@ 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 branch --set-upstream" can be used to update the (surprise!) upstream
109
+ * "git branch --set-upstream" can be used to update the (surprise!) upstream,
110
i.e. where the branch is supposed to pull and merge from (or rebase onto).
111
112
* "git checkout A...B" is a way to detach HEAD at the merge base between
@@ -133,7 +133,7 @@ Updates since v1.6.6
133
* "git fetch --all" can now be used in place of "git remote update".
134
135
* "git grep" does not rely on external grep anymore. It can use more than
136
- one threads to accelerate the operation.
136
+ one thread to accelerate the operation.
137
138
* "git grep" learned "--quiet" option.
139
@@ -159,13 +159,13 @@ Updates since v1.6.6
159
* "git rebase --onto A...B" means the history is replayed on top of the
160
merge base between A and B.
161
162
- * "git rebase -i" learned new action "fixup", that squashes the change
162
+ * "git rebase -i" learned new action "fixup" that squashes the change
163
but does not affect existing log message.
164
165
- * "git rebase -i" also learned --autosquash option, that is useful
165
+ * "git rebase -i" also learned --autosquash option that is useful
166
together with the new "fixup" action.
167
168
- * "git remote" learned set-url subcommand, to update (surprise!) url
168
+ * "git remote" learned set-url subcommand that updates (surprise!) url
169
for an existing remote nickname.
170
171
* "git rerere" learned "forget path" subcommand. Together with "git