![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 10 Jul 2006 07:53:39 +0000 (00:53 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 10 Jul 2006 07:53:39 +0000 (00:53 -0700) | ||
| commit | 868227b0d1f3a295ea9afe7a3be3a1fbdff62442 | |
| tree | b35d790d4b474a9eb9b2864a43a759b442d5f326 | tree | snapshot |
| parent | a9486b02ec7e03d17317fe538b0d06ca04379f23 | commit | diff |
| parent | ae3e5e1ef2271524882d6bb7c0469f777a255315 | commit | diff |
Merge branch 'jc/show-merge'
* jc/show-merge:
git log -p --merge [[--] paths...]
* jc/show-merge:
git log -p --merge [[--] paths...]