summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-29 04:57:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-29 04:57:59 (GMT)
commit6a6955134b87ba3ea7d54467e637be0da7ba170b (patch)
tree7634d1aa5b096b54933a5a6cc509bd9d2650a971
parent99f5b0845ac53f9f6e845fe4401e68fcef154690 (diff)
downloadgit-6a6955134b87ba3ea7d54467e637be0da7ba170b.zip
git-6a6955134b87ba3ea7d54467e637be0da7ba170b.tar.gz
git-6a6955134b87ba3ea7d54467e637be0da7ba170b.tar.bz2
Update draft release notes to 1.7.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.7.1.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt
index 750d40f..19aeef5 100644
--- a/Documentation/RelNotes-1.7.1.txt
+++ b/Documentation/RelNotes-1.7.1.txt
@@ -7,19 +7,14 @@ Updates since v1.7.0
* Some commands (e.g. svn and http interfaces) that interactively ask
password can be told to use an external program given via GIT_ASKPASS.
- * Color values given to "color.<cmd>.<slot>" configuration can now have
- more than one attributes (e.g. "bold ul").
-
- * "git apply --whitespace=fix" didn't work well when an early patch in
- a patch series adds trailing blank lines and a later one depended on
- such a block of blank lines at the end.
-
* "git am" learned "--keep-cr" option to handle inputs that are
mixture of changes to files with and without CRLF line endings.
* "git cvsimport" learned -R option to leave revision mapping between
CVS revisions and resulting git commits.
+ * "git diff --submodule" notices and descries dirty submodules.
+
* "git for-each-ref" learned %(symref), %(symref:short) and %(flag)
tokens.
@@ -36,11 +31,15 @@ Updates since v1.7.0
* "git grep" learned to paint filename and line-number in colors.
+ * "git log -p --first-parent -m" shows one-parent diff for merge
+ commits, instead of showing combined diff.
+
* "git merge-file" learned to use custom conflict marker size and also use
the "union merge" behaviour.
* "git notes" command has been rewritten in C and learned quite a
- many commands.
+ many commands and features to help you carry notes forward across
+ rebases and amends.
* "git request-pull" identifies the commit the request is relative to in
a more readable way.
@@ -49,6 +48,8 @@ Updates since v1.7.0
near the tip while preserving your local changes in a way similar
to how "git checkout branch" does.
+ * "git status" notices and descries dirty submodules.
+
* "git svn" should work better when interacting with repositories
with CRLF line endings.
@@ -66,5 +67,5 @@ release, unless otherwise noted.
---
exec >/var/tmp/1
echo O=$(git describe)
-O=v1.7.0.2-323-g0d0925c
+O=v1.7.0.3-310-g99f5b08
git shortlog --no-merges ^maint $O..