Skip to content

Commit

Permalink
Documentation: minor fixes to RelNotes-1.7.0
Browse files Browse the repository at this point in the history
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael J Gruber authored and Junio C Hamano committed Feb 12, 2010
1 parent 85f6b43 commit f937421
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Documentation/RelNotes-1.7.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Git v1.7.0 Release Notes
Notes on behaviour change
-------------------------

* "git push" into a branch that is currently checked out (i.e. pointed by
* "git push" into a branch that is currently checked out (i.e. pointed at by
HEAD in a repository that is not bare) is refused by default.

Similarly, "git push $there :$killed" to delete the branch $killed
Expand All @@ -19,7 +19,7 @@ Notes on behaviour change
patch series with more than two messages. All messages will be sent
as a reply to the first message, i.e. cover letter.

It has been possible to configure send-email to send "shallow thread"
It has been possible already to configure send-email to send "shallow thread"
by setting sendemail.chainreplyto configuration variable to false. The
only thing this release does is to change the default when you haven't
configured that variable.
Expand All @@ -30,7 +30,7 @@ Notes on behaviour change
* "git diff" traditionally treated various "ignore whitespace" options
only as a way to filter the patch output. "git diff --exit-code -b"
exited with non-zero status even if all changes were about changing the
ammount of whitespace and nothing else. and "git diff -b" showed the
amount of whitespace and nothing else; and "git diff -b" showed the
"diff --git" header line for such a change without patch text.

In this release, the "ignore whitespaces" options affect the semantics
Expand Down Expand Up @@ -106,7 +106,7 @@ Updates since v1.6.6
defaults to the current branch, so "git fetch && git merge @{upstream}"
will be equivalent to "git pull".

* "git branch --set-upstream" can be used to update the (surprise!) upstream
* "git branch --set-upstream" can be used to update the (surprise!) upstream,
i.e. where the branch is supposed to pull and merge from (or rebase onto).

* "git checkout A...B" is a way to detach HEAD at the merge base between
Expand All @@ -133,7 +133,7 @@ Updates since v1.6.6
* "git fetch --all" can now be used in place of "git remote update".

* "git grep" does not rely on external grep anymore. It can use more than
one threads to accelerate the operation.
one thread to accelerate the operation.

* "git grep" learned "--quiet" option.

Expand All @@ -159,13 +159,13 @@ Updates since v1.6.6
* "git rebase --onto A...B" means the history is replayed on top of the
merge base between A and B.

* "git rebase -i" learned new action "fixup", that squashes the change
* "git rebase -i" learned new action "fixup" that squashes the change
but does not affect existing log message.

* "git rebase -i" also learned --autosquash option, that is useful
* "git rebase -i" also learned --autosquash option that is useful
together with the new "fixup" action.

* "git remote" learned set-url subcommand, to update (surprise!) url
* "git remote" learned set-url subcommand that updates (surprise!) url
for an existing remote nickname.

* "git rerere" learned "forget path" subcommand. Together with "git
Expand Down

0 comments on commit f937421

Please sign in to comment.