projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c18ee7 376eb14)
Merge branch 'mg/branch-list'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:23 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:23 +0000 (12:36 -0700)
commit1077bf1ff676cd172a09b88204422228f21d7cbf
tree09198a4933da76f03c78ab6c088999a1e2fe0ce1tree | snapshot
parent3c18ee72cc2f3d0024b7314cdb1af5d41aea136acommit | diff
parent376eb14a05f693378047eee36a10035c122f0261commit | 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
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
Git—the stupid content tracker