Git 1.7.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-02-12 15:45:05 -08:00
parent ca5812d2e3
commit e923eaeb90
3 changed files with 11 additions and 1 deletions

View File

@ -106,6 +106,8 @@ Updates since v1.6.6
defaults to the current branch, so "git fetch && git merge @{upstream}" defaults to the current branch, so "git fetch && git merge @{upstream}"
will be equivalent to "git pull". will be equivalent to "git pull".
* "git am --resolved" has a synonym "git am --continue".
* "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). i.e. where the branch is supposed to pull and merge from (or rebase onto).
@ -200,6 +202,9 @@ release, unless otherwise noted.
the branch is fully merged to its upstream branch if it is not merged the branch is fully merged to its upstream branch if it is not merged
to the current branch. It now deletes it in such a case. to the current branch. It now deletes it in such a case.
* "fiter-branch" command incorrectly said --prune-empty and --filter-commit
were incompatible; the latter should be read as --commit-filter.
* When using "git status" or asking "git diff" to compare the work tree * When using "git status" or asking "git diff" to compare the work tree
with something, they used to consider that a checked-out submodule with with something, they used to consider that a checked-out submodule with
uncommitted changes is not modified; this could cause people to forget uncommitted changes is not modified; this could cause people to forget

View File

@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.7.0/git.html[documentation for release 1.7.0]
* release notes for
link:RelNotes-1.7.0.txt[1.7.0].
* link:v1.6.6.2/git.html[documentation for release 1.6.6.2] * link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
* release notes for * release notes for

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.6.6.GIT DEF_VER=v1.7.0
LF=' LF='
' '