From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Jan 2009 00:30:13 +0000 (-0800)
Subject: Sync with 1.6.1.1
X-Git-Tag: v1.6.2-rc0~94
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c42b1ad944413ac8978f166dbb98bcd4716ef551;p=git.git

Sync with 1.6.1.1
---

c42b1ad944413ac8978f166dbb98bcd4716ef551
diff --cc Documentation/git.txt
index 17dc8b201,17dc8b201..cd527c625
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,9 +43,10 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
--* link:v1.6.1/git.html[documentation for release 1.6.1]
++* link:v1.6.1.1/git.html[documentation for release 1.6.1.1]
  
  * release notes for
++  link:RelNotes-1.6.1.1.txt[1.6.1.1],
    link:RelNotes-1.6.1.txt[1.6.1].
  
  * link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
diff --cc GIT-VERSION-GEN
index 6c7465c75,fe496e5fc..9c9fe640f
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v1.6.0.2.GIT
 -DEF_VER=v1.6.1.1.GIT
++DEF_VER=v1.6.1.GIT
  
  LF='
  '