From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 22:41:38 +0000 (-0800)
Subject: Merge branch 'nd/branch-error-cases'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f507784d2c956fc73f3791b04cc80e7e0dae0a4d;p=git.git

Merge branch 'nd/branch-error-cases'

Fix various error messages and conditions in "git branch", e.g. we
advertised "branch -d/-D" to remove one or more branches but actually
implemented removal of zero or more branches---request to remove no
branches was not rejected.

* nd/branch-error-cases:
  branch: let branch filters imply --list
  docs: clarify git-branch --list behavior
  branch: mark more strings for translation
  branch: give a more helpful message on redundant arguments
  branch: reject -D/-d without branch name
---

f507784d2c956fc73f3791b04cc80e7e0dae0a4d