Merge branch 'jc/branch-merged'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:47:01 +0000 (23:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:47:01 +0000 (23:47 -0700)
commitb773fc34a0425790db7fe7c6a2d02d742ff41081
tree27f2e05802b258f82f3ab254f380be9e8e264524
parent633ce9a3ba973acf19a122e1359b7ae724887d70
parent049716b370f2cebdbdeb278eb2a8c4eff8ed0acd
Merge branch 'jc/branch-merged'

* jc/branch-merged:
  branch --merged/--no-merged: allow specifying arbitrary commit
  branch --contains: default to HEAD
  parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

Conflicts:
Documentation/git-branch.txt
Documentation/git-branch.txt
builtin-branch.c