diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.7.0.txt | 5 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt index 0815ca1667..43e3f33615 100644 --- a/Documentation/RelNotes-1.7.0.txt +++ b/Documentation/RelNotes-1.7.0.txt @@ -106,6 +106,8 @@ Updates since v1.6.6 defaults to the current branch, so "git fetch && git merge @{upstream}" 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, 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 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 with something, they used to consider that a checked-out submodule with uncommitted changes is not modified; this could cause people to forget diff --git a/Documentation/git.txt b/Documentation/git.txt index b7df54dfa7..01c463101b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. 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] * release notes for |