Andrew's git / gitweb.git / diff
?
Sync with 1.7.1.2
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Jul 2010 23:40:15 +0000 (16:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Jul 2010 23:40:23 +0000 (16:40 -0700)
1  2 
Documentation/git.txt patch | diff1 | diff2 | blob | history
t/t1300-repo-config.sh patch | diff1 | diff2 | blob | history
diff --cc Documentation/git.txt
index 27ece5885720c0db79e30a6de9663e3bdfb37f07,b5a4e3d4031961d648b52abc1c64df5b4acfb32c..f6e10f586c8d4e8fa8231f118cd5a107e79c4371
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,14 -43,11 +44,15 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.7.2/git.html[documentation for release 1.7.2]
 +
 +* release notes for
 +  link:RelNotes-1.7.2.txt[1.7.2].
  
- * link:v1.7.1.1/git.html[documentation for release 1.7.1.1]
+ * link:v1.7.1.2/git.html[documentation for release 1.7.1.2]
  
  * release notes for
+   link:RelNotes-1.7.1.2.txt[1.7.1.2],
    link:RelNotes-1.7.1.1.txt[1.7.1.1],
    link:RelNotes-1.7.1.txt[1.7.1].
  
diff --cc t/t1300-repo-config.sh
Simple merge