diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:22 -0700 |
| commit | 299deeac8a67ef80989b86a75b012be1d2193bf9 (patch) | |
| tree | cfc3ad84c4c300498b6aaf65cfb40ac823496d69 /builtin/grep.c | |
| parent | Merge branch 'tg/range-diff-same-file-fix' (diff) | |
| parent | pull: don't warn if pull.ff has been set (diff) | |
| download | tgif-299deeac8a67ef80989b86a75b012be1d2193bf9.tar.xz | |
Merge branch 'ah/pull'
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.
* ah/pull:
pull: don't warn if pull.ff has been set
Diffstat (limited to 'builtin/grep.c')
0 files changed, 0 insertions, 0 deletions