![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:42:04 +0000 (14:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:42:04 +0000 (14:42 -0800) | ||
| commit | cea20f24738c558d56483402db1ddfebd0362ee4 | |
| tree | 2d5010857dd1d87b4b5735dea3d423acb68836fb | tree | snapshot |
| parent | cc6b41cc7d38c1b2de9809c0995087a2378d27ec | commit | diff |
| parent | f59baa502f49c3f1579a82bc37d2bb3ce9e7b5da | commit | diff |
Merge branch 'ns/rebase-auto-squash'
* ns/rebase-auto-squash:
rebase -i --autosquash: auto-squash commits
Conflicts:
git-rebase--interactive.sh
* ns/rebase-auto-squash:
rebase -i --autosquash: auto-squash commits
Conflicts:
git-rebase--interactive.sh
| git-rebase--interactive.sh | diff1 | | diff2 | | blob | history |