| commit | f507784d2c956fc73f3791b04cc80e7e0dae0a4d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Feb 2013 22:41:38 +0000 (7 14:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Feb 2013 22:41:38 +0000 (7 14:41 -0800) | ||
| tree | 53e4add6b038d1a2d8a69b59a93315e71e5fca9a | treesnapshot (tar.gz zip) |
| parent | 9a1ab9e72fe8acd03b92bb481d7cd95207fda8f5 | commitdiff |
| parent | d040350813986e0f4bb3aeb977077975c1552606 | commitdiff |
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
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
| Documentation/git-branch.txt | diff1 | diff2 | blobhistory |
| builtin/branch.c | diff1 | diff2 | blobhistory |