From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Mar 2006 07:44:14 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~3
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=d93067d9c7fb210766c7282d662289f54d53f93a

Merge branch 'master' into next

* master:
  Optionally do not list empty directories in git-ls-files --others
  Document git-rebase behavior on conflicts.
  Fix error handling for nonexistent names
---

d93067d9c7fb210766c7282d662289f54d53f93a