Signed-off-by: Junio C Hamano <email@example.com>
diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt
index 19aeef5..02f9257 100644
@@ -4,9 +4,17 @@
Updates since v1.7.0
+ * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/.
* Some commands (e.g. svn and http interfaces) that interactively ask
password can be told to use an external program given via GIT_ASKPASS.
+ * Conflict markers that lead the common ancestor in diff3-style output
+ now has a label, which hopefully would help third-party tools that
+ expect one.
+ * Comes with an updated bash-completion script.
* "git am" learned "--keep-cr" option to handle inputs that are
mixture of changes to files with and without CRLF line endings.
@@ -64,8 +72,14 @@
* "git add frotz/nitfol" did not complain when the entire frotz/ directory
+ * "git rev-list --pretty=oneline" didn't terminate a record with LF for
+ commits without any message.
+ * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike
+ newer tools in the git toolset.
echo O=$(git describe)
git shortlog --no-merges ^maint $O..