summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 99f5b08)
raw | patch | inline | side by side (parent: 99f5b08)
author | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Mar 2010 04:57:59 +0000 (21:57 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Mar 2010 04:57:59 +0000 (21:57 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes-1.7.1.txt | patch | blob | history |
index 750d40f34ad36680640d6efd98b59ba6dc7900be..19aeef5effd16a7a7fc5409ca42bc54eb780e991 100644 (file)
* 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.
* "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.
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.
---
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..