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

1  2 
Documentation/git-branch.txt
builtin-branch.c

@@@ -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
  -----------
Simple merge