From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Jun 2006 21:36:10 +0000 (-0700)
Subject: Merge branch 'jc/squash'
X-Git-Tag: v1.4.1-rc2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ef9e05dbf36a80bb65fb150dd7bdd60852db777;p=thirdparty%2Fgit.git

Merge branch 'jc/squash'

* jc/squash:
  git-merge --squash
---

1ef9e05dbf36a80bb65fb150dd7bdd60852db777