![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 06:47:01 +0000 (23:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 06:47:01 +0000 (23:47 -0700) | ||
| commit | b773fc34a0425790db7fe7c6a2d02d742ff41081 | |
| tree | 27f2e05802b258f82f3ab254f380be9e8e264524 | tree | snapshot |
| parent | 633ce9a3ba973acf19a122e1359b7ae724887d70 | commit | diff |
| parent | 049716b370f2cebdbdeb278eb2a8c4eff8ed0acd | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| builtin-branch.c | diff1 | | diff2 | | blob | history |