Merge branch 'bg/merge-ff-only'
* bg/merge-ff-only: Teach 'git merge' and 'git pull' the option --ff-only
Junio C Hamano committed
Nov 10, 2009 at 12:32 UTC
3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1
No changes.
* bg/merge-ff-only: Teach 'git merge' and 'git pull' the option --ff-only
No changes.