pull: allow pull to preserve merges when rebasing
authorStephen Haberman <stephen@exigencecorp.com>
Tue, 13 Aug 2013 03:43:42 +0000 (22:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:45:48 +0000 (12:45 -0700)
commit66713ef...b00933755cdeff1ae823dda7b5843640
treea6cd1fc...0f748c761efb831cf555bab21628c47acopy hash to clipboard (tree)
parent96cb27a...d2db3c01b8e296a0fbc1da1da09d1412copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-pull.txt
git-pull.sh
t/t5520-pull.sh