Commit graph

2 commits

Author SHA1 Message Date
Nicolai Skogheim 2d8b703e7c merge-into: change --ff option to --ff-only. fix #421 2015-08-14 13:03:39 +02:00
spacewander 46525fbfe8 add docs for git-merge-into 2015-03-10 23:50:09 +08:00