diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:44 -0700 |
| commit | 9234b003726556e0d3d0ea8ade97dc9f7bd50a6e (patch) | |
| tree | 194e8895d8a2e7c7dba0f5e6ab9108231aaae711 /git-svn.perl | |
| parent | 7b1cb5c40ebb57c5a26f1335807be24dba8d4518 (diff) | |
| parent | b499549401cb2b1f6c30d09681380fd519938eb0 (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
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions