git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 369ae75 d18c950)
Merge branch 'ah/force-pull-rebase-configuration'
authorJunio C Hamano <redacted>
Fri, 27 Mar 2020 00:11:21 +0000 (17:11 -0700)
committerJunio C Hamano <redacted>
Fri, 27 Mar 2020 00:11:21 +0000 (17:11 -0700)
"git pull" learned to warn when no pull.rebase configuration
exists, and neither --[no-]rebase nor --ff-only is given (which
would result a merge).

* ah/force-pull-rebase-configuration:
  pull: warn if the user didn't say whether to rebase or to merge


Trivial merge
git clone https://git.99rst.org/PROJECT