![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 May 2008 02:16:06 +0000 (19:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 May 2008 02:16:06 +0000 (19:16 -0700) | ||
| commit | b79c9859c8eb3bb4390f91320e126199ff884907 | |
| tree | ecb36c8abbef20850f0c05e4ac003004d1b50b44 | tree | snapshot |
| parent | dc484f2213a34ced5abe5eb968650035204b6035 | commit | diff |
| parent | f9fd5210c825dfcd245a2cd38e7b12c03000c33f | commit | diff |
Merge branch 'lh/branch-merged'
* lh/branch-merged:
Add tests for `branch --[no-]merged`
git-branch.txt: compare --contains, --merged and --no-merged
git-branch: add support for --merged and --no-merged
* lh/branch-merged:
Add tests for `branch --[no-]merged`
git-branch.txt: compare --contains, --merged and --no-merged
git-branch: add support for --merged and --no-merged