summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes-1.7.0.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-12 23:45:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-12 23:45:05 (GMT)
commite923eaeb901ff056421b9007adcbbce271caa7b6 (patch)
treee547efeb37695aaa9b17783d82612fc5e08c0021 /Documentation/RelNotes-1.7.0.txt
parentca5812d2e3c72b09008422975740aff41a2c65a0 (diff)
downloadgit-e923eaeb901ff056421b9007adcbbce271caa7b6.zip
git-e923eaeb901ff056421b9007adcbbce271caa7b6.tar.gz
git-e923eaeb901ff056421b9007adcbbce271caa7b6.tar.bz2
Git 1.7.0v1.7.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes-1.7.0.txt')
-rw-r--r--Documentation/RelNotes-1.7.0.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt
index 0815ca1..43e3f33 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