Merge branch 'jc/squash'
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:36:10 +0000 (14:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:36:10 +0000 (14:36 -0700)
* jc/squash:
  git-merge --squash

1  2 
git-commit.sh

diff --cc git-commit.sh
Simple merge