Merge branch 'master' into next
commitd93067d9c7fb210766c7282d662289f54d53f93a
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:14 +0000 (26 23:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:14 +0000 (26 23:44 -0800)
treea463ad3ce94a987ec3d00e10eaa98ede1fe0495d
parentf4e96f97e85c145616bc2e23e9441bc0daa2906e
parentb0a3de42316a4e8f1d561cbe12b7bb282631a0d6
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
Documentation/git-ls-files.txt
ls-files.c