Commit graph

3 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
phigoro 09d967dfbd align hashbang of git-guilt & git-merge-into 2015-05-10 12:01:38 +03:00
spacewander d94663312f add merge-into to merge two branches quickly 2015-03-10 23:45:00 +08:00