]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d637d1b ef93e3a)
Merge branch 'da/pull-ff-configuration'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:11 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:11 +0000 (14:01 -0800)
commit7da5fd6895af9066ad4684e333c57f4086589c2f
tree17f5d719d315e3106cb56c60b3edf87e9976d3a0tree | snapshot
parentd637d1b9a8fb765a8542e69bd2e04b3e229f663bcommit | diff
parentef93e3a49c3b2b62c6c450f862ce1626bc8dab54commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
git-pull.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.