Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:14 +0000 (23:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:14 +0000 (23:44 -0800)
* master:
  Optionally do not list empty directories in git-ls-files --others
  Document git-rebase behavior on conflicts.
  Fix error handling for nonexistent names


No differences found