Git 1.7.1.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --combined Documentation/RelNotes/1.7.1.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5b18518449077746c42d4297eedd1232379fdafa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/1.7.1.3.txt
@@@ -1,0 -1,0 +1,10 @@@
++Git v1.7.1.3 Release Notes
++==========================
++
++This is primarily to backport support for the new "add.ignoreErrors"
++name given to the existing "add.ignore-errors" configuration variable.
++
++The next version, Git 1.7.4, and future versions, will support both
++old and incorrect name and the new corrected name, but without this
++backport, users who want to use the new name "add.ignoreErrors" in
++their repositories cannot use older versions of Git.

diff --combined GIT-VERSION-GEN
index 31d95da4f0adc89466acc62accd90e67cfa0353a,4149fa9eb7a77eef45152394504eb7ab8ba2140b..8eb10c2c1fd974cb8bc2cd9540ca42e24eed0874
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v1.7.1.2
 -DEF_VER=v1.7.0.8
++DEF_VER=v1.7.1.3
  
  LF='
  '
@@@ -12,7 -12,7 +12,7 @@@ if test -f versio
  then
        VN=$(cat version) || VN="$DEF_VER"
  elif test -d .git -o -f .git &&
 -      VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
 +      VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)

diff --combined RelNotes
index 573ee74d24fb63ae5394d33efc06c2e3c3a0542e,882532b0486688b101c5a14b758c3ced5ba82c8a..d3921d81b8d765147c373118e6775faacb9ab25e
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes-1.7.1.2.txt
 -Documentation/RelNotes/1.7.0.8.txt
++Documentation/RelNotes/1.7.1.3.txt