![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Jun 2006 21:36:10 +0000 (14:36 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Jun 2006 21:36:10 +0000 (14:36 -0700) | ||
| commit | 1ef9e05dbf36a80bb65fb150dd7bdd60852db777 | |
| tree | 319b38fbc0efc75d216bacccbeb53cc3ed42e50f | tree | snapshot |
| parent | 6a0dbb8a5c41770c2280de15c3202970c6515ccc | commit | diff |
| parent | 7d0c68871a86df0654454df047458836afa13129 | commit | diff |
Merge branch 'jc/squash'
* jc/squash:
git-merge --squash
* jc/squash:
git-merge --squash
| git-commit.sh | diff1 | | diff2 | | blob | history |