| commit | 7da5fd6895af9066ad4684e333c57f4086589c2f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Feb 2014 22:01:11 +0000 (27 14:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Feb 2014 22:01:11 +0000 (27 14:01 -0800) | ||
| tree | 17f5d719d315e3106cb56c60b3edf87e9976d3a0 | treesnapshot (tar.gz zip) |
| parent | d637d1b9a8fb765a8542e69bd2e04b3e229f663b | commitdiff |
| parent | ef93e3a49c3b2b62c6c450f862ce1626bc8dab54 | commitdiff |
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
"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 | blobhistory |
| git-pull.sh | diff1 | diff2 | blobhistory |