From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Sep 2008 00:10:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~281
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=106db883b791efb7f39f3b2f8553236ba792a89e;p=git.git

Merge branch 'maint'

* maint:
  Makefile: add merge_recursive.h to LIB_H
  Improve documentation for --dirstat diff option
  Bring local clone's origin URL in line with that of a remote clone
  Documentation: minor cleanup in a use case in 'git stash' manual
  Documentation: fix disappeared lines in 'git stash' manpage
  Documentation: fix reference to a for-each-ref option
---

106db883b791efb7f39f3b2f8553236ba792a89e