summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-03 12:28:44 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-03 12:28:44 -0700
commit9234b003726556e0d3d0ea8ade97dc9f7bd50a6e (patch)
tree194e8895d8a2e7c7dba0f5e6ab9108231aaae711 /INSTALL
parent7b1cb5c40ebb57c5a26f1335807be24dba8d4518 (diff)
parentb499549401cb2b1f6c30d09681380fd519938eb0 (diff)
downloadgit-9234b003726556e0d3d0ea8ade97dc9f7bd50a6e.tar.gz
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 'INSTALL')
0 files changed, 0 insertions, 0 deletions