diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-26 17:11:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-26 17:11:21 -0700 |
| commit | 1c56d6f57adebf2a0ac910ca62a940dc7820bb68 (patch) | |
| tree | c9fc0788d428a225cfa41d6f666de7dea369e0ee /diff-no-index.c | |
| parent | Merge branch 'tg/retire-scripted-stash' (diff) | |
| parent | pull: warn if the user didn't say whether to rebase or to merge (diff) | |
| download | tgif-1c56d6f57adebf2a0ac910ca62a940dc7820bb68.tar.xz | |
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
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions