diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:47:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:47:01 -0700 |
| commit | b773fc34a0425790db7fe7c6a2d02d742ff41081 (patch) | |
| tree | 27f2e05802b258f82f3ab254f380be9e8e264524 /merge-index.c | |
| parent | Merge branch 'jc/rebase-orig-head' (diff) | |
| parent | branch --merged/--no-merged: allow specifying arbitrary commit (diff) | |
| download | tgif-b773fc34a0425790db7fe7c6a2d02d742ff41081.tar.xz | |
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
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions