summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 22:01:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-27 22:01:11 (GMT)
commit7da5fd6895af9066ad4684e333c57f4086589c2f (patch)
tree17f5d719d315e3106cb56c60b3edf87e9976d3a0 /t/t3030-merge-recursive.sh
parentd637d1b9a8fb765a8542e69bd2e04b3e229f663b (diff)
parentef93e3a49c3b2b62c6c450f862ce1626bc8dab54 (diff)
downloadgit-7da5fd6895af9066ad4684e333c57f4086589c2f.zip
git-7da5fd6895af9066ad4684e333c57f4086589c2f.tar.gz
git-7da5fd6895af9066ad4684e333c57f4086589c2f.tar.bz2
Merge branch 'da/pull-ff-configuration'
"git pull" learned to pay attention to pull.ff configuration variable. * da/pull-ff-configuration: pull: add --ff-only to the help text pull: add pull.ff configuration
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions