]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
"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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
git-pull.sh patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
diff --cc git-pull.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.