Merge branch 'mg/branch-list'

* mg/branch-list:
  t3200: clean up checks for file existence
  branch: -v does not automatically imply --list
  branch: allow pattern arguments
  branch: introduce --list option
  git-branch: introduce missing long forms for the options
  git-tag: introduce long forms for the options
  t6040: test branch -vv

Conflicts:
	Documentation/git-tag.txt
	t/t3200-branch.sh

diff --cc Documentation/git-tag.txt
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc t/t3200-branch.sh
index 7633930bb472e1c9aebf2799f3eaf3bc53c7263c,d5301038781eb8cb334c9a516651fc31ad7532a5..2f5eada0d2801c7bc99dbbbed4d7b0ff839f25b7
--- 1/t/t3200-branch.sh
--- 2/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -98,18 -98,38 +98,50 @@@ test_expect_success 'git branch -m q r/
        test_must_fail git branch -m q r/q
  '
  
 +test_expect_success 'git branch -M foo bar should fail when bar is checked out' '
 +      git branch bar &&
 +      git checkout -b foo &&
 +      test_must_fail git branch -M bar foo
 +'
 +
 +test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
 +      git checkout -b baz &&
 +      git branch bam &&
 +      git branch -M baz bam
 +'
 +
+ test_expect_success 'git branch -v -d t should work' '
+       git branch t &&
+       test_path_is_file .git/refs/heads/t &&
+       git branch -v -d t &&
+       test_path_is_missing .git/refs/heads/t
+ '
+ 
+ test_expect_success 'git branch -v -m t s should work' '
+       git branch t &&
+       test_path_is_file .git/refs/heads/t &&
+       git branch -v -m t s &&
+       test_path_is_missing .git/refs/heads/t &&
+       test_path_is_file .git/refs/heads/s &&
+       git branch -d s
+ '
+ 
+ test_expect_success 'git branch -m -d t s should fail' '
+       git branch t &&
+       test_path_is_file .git/refs/heads/t &&
+       test_must_fail git branch -m -d t s &&
+       git branch -d t &&
+       test_path_is_missing .git/refs/heads/t
+ '
+ 
+ test_expect_success 'git branch --list -d t should fail' '
+       git branch t &&
+       test_path_is_file .git/refs/heads/t &&
+       test_must_fail git branch --list -d t &&
+       git branch -d t &&
+       test_path_is_missing .git/refs/heads/t
+ '
+ 
  mv .git/config .git/config-saved
  
  test_expect_success 'git branch -m q q2 without config should succeed' '

diff --cc t/t6040-tracking-info.sh
Simple merge