![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 Apr 2010 19:28:44 +0000 (12:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 Apr 2010 19:28:44 +0000 (12:28 -0700) | ||
| commit | 9234b003726556e0d3d0ea8ade97dc9f7bd50a6e | |
| tree | 194e8895d8a2e7c7dba0f5e6ab9108231aaae711 | tree | snapshot |
| parent | 7b1cb5c40ebb57c5a26f1335807be24dba8d4518 | commit | diff |
| parent | b499549401cb2b1f6c30d09681380fd519938eb0 | commit | diff |
Merge branch 'mb/rebase-i-no-ff'
* mb/rebase-i-no-ff:
Teach rebase the --no-ff option.
Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
* mb/rebase-i-no-ff:
Teach rebase the --no-ff option.
Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
| git-rebase--interactive.sh | diff1 | | diff2 | | blob | history |
| git-rebase.sh | diff1 | | diff2 | | blob | history |
| t/t3404-rebase-interactive.sh | diff1 | | diff2 | | blob | history |