From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Jul 2008 06:47:01 +0000 (-0700)
Subject: Merge branch 'jc/branch-merged'
X-Git-Tag: v1.6.0-rc0~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b773fc34a0425790db7fe7c6a2d02d742ff41081;p=git.git

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
---

b773fc34a0425790db7fe7c6a2d02d742ff41081
diff --cc Documentation/git-branch.txt
index b3e62ed01,450f90368..fc5a4a602
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -8,12 -8,12 +8,12 @@@ git-branch - List, create, or delete br
  SYNOPSIS
  --------
  [verse]
- 'git branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
- 	   [-v [--abbrev=<length> | --no-abbrev]]
- 	   [--contains <commit>]
 -'git-branch' [--color | --no-color] [-r | -a]
++'git branch' [--color | --no-color] [-r | -a]
+ 	[-v [--abbrev=<length> | --no-abbrev]]
+ 	[(--merged | --no-merged | --contains) [<commit>]]
 -'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
 -'git-branch' (-m | -M) [<oldbranch>] <newbranch>
 -'git-branch' (-d | -D) [-r] <branchname>...
 +'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
 +'git branch' (-m | -M) [<oldbranch>] <newbranch>
 +'git branch' (-d | -D) [-r] <branchname>...
  
  DESCRIPTION
  -----------