]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 369ae75 d18c950)
Merge branch 'ah/force-pull-rebase-configuration'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2020 00:11:21 +0000 (17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2020 00:11:21 +0000 (17:11 -0700)
commit1c56d6f57adebf2a0ac910ca62a940dc7820bb68
treec9fc0788d428a225cfa41d6f666de7dea369e0eetree | snapshot
parent369ae7567a4621aa81e5c4decc27715418564ac2commit | diff
parentd18c950a69f3a24e1e3add3d9fc427641f53e12bcommit | diff
Merge branch 'ah/force-pull-rebase-configuration'

"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
Unnamed repository; edit this file 'description' to name the repository.