summary refs log tree commit
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-26 13:59:20 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-26 13:59:20 -0700
commitd5cb9cbd64165153a318e1049f8bf14b09a16b11 (patch)
tree97ac3b7b32b5dc217f2d17a7d8659bd0c96acf02
parente28eae3184b26d3cf3293e69403babb5c575342c (diff)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.10.0.txt3
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
index 5586111045..c110091580 100644
--- a/Documentation/RelNotes/2.10.0.txt
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -252,6 +252,9 @@ Performance, Internal Implementation, Development Support etc.
    combination has been fixed to be equivalent to doing
    $ git config core.autocrlf true
 
+ * Documentation has been updated to show better example usage
+   of the updated "text=auto" attribute.
+
  * A few tests that specifically target "git rebase -i" have been
    added.
 
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 702c067a78..1ca5c0e366 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.10.0-rc1
+DEF_VER=v2.10.0-rc2
 
 LF='
 '