Merge branch 'maint' to synchronize with 1.5.3.6
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2007 23:15:47 +0000 (15:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2007 23:21:12 +0000 (15:21 -0800)
* maint:
  GIT 1.5.3.6
  grep -An -Bm: fix invocation of external grep command

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1  2 
Documentation/git.txt

diff --combined Documentation/git.txt
@@@ -46,12 -46,7 +46,13 @@@ Documentation for older releases are av
  * link:v1.5.3/git.html[documentation for release 1.5.3]
  
  * release notes for
 -  link:RelNotes-1.5.3.1.txt[1.5.3.1].
++  link:RelNotes-1.5.3.6.txt[1.5.3.6],
 +  link:RelNotes-1.5.3.5.txt[1.5.3.5],
 +  link:RelNotes-1.5.3.4.txt[1.5.3.4],
 +  link:RelNotes-1.5.3.3.txt[1.5.3.3],
 +  link:RelNotes-1.5.3.2.txt[1.5.3.2],
 +  link:RelNotes-1.5.3.1.txt[1.5.3.1],
 +  link:RelNotes-1.5.3.txt[1.5.3].
  
  * release notes for
    link:RelNotes-1.5.2.5.txt[1.5.2.5],
@@@ -328,7 -323,7 +329,7 @@@ For a more complete list of ways to spe
  File/Directory Structure
  ------------------------
  
 -Please see link:repository-layout.html[repository layout] document.
 +Please see the link:repository-layout.html[repository layout] document.
  
  Read link:hooks.html[hooks] for more details about each hook.
  
@@@ -338,7 -333,7 +339,7 @@@ Higher level SCMs may provide and manag
  
  Terminology
  -----------
 -Please see link:glossary.html[glossary] document.
 +Please see the link:glossary.html[glossary] document.
  
  
  Environment Variables