![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:36:23 +0000 (12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:36:23 +0000 (12:36 -0700) | ||
| commit | 1077bf1ff676cd172a09b88204422228f21d7cbf | |
| tree | 09198a4933da76f03c78ab6c088999a1e2fe0ce1 | tree | snapshot |
| parent | 3c18ee72cc2f3d0024b7314cdb1af5d41aea136a | commit | diff |
| parent | 376eb14a05f693378047eee36a10035c122f0261 | commit | diff |
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
* 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
| Documentation/git-tag.txt | diff1 | | diff2 | | blob | history |
| builtin/branch.c | diff1 | | diff2 | | blob | history |
| builtin/tag.c | diff1 | | diff2 | | blob | history |
| t/t3200-branch.sh | diff1 | | diff2 | | blob | history |
| t/t6040-tracking-info.sh | diff1 | | diff2 | | blob | history |