pull: support pull.ff config
authorPaul Tan <pyokagan@gmail.com>
Thu, 18 Jun 2015 10:54:03 +0000 (18:54 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2015 20:17:09 +0000 (13:17 -0700)
commita9de989...5479ef7d42986db63c16251c1f87ebcb
tree15e0a88...9ec52ae65b75734b1eb9022a8a4deae1copy hash to clipboard (tree)
parent44c175c...a46b3a0446e046bdaa566adb9e57d89dcopy hash to clipboard (diff)
builtin/pull.c