summaryrefslogtreecommitdiff
path: root/hash-lookup.c
diff options
context:
space:
mode:
authorLibravatar Erwin Villejo <erwin.villejo@gmail.com>2021-11-17 07:55:50 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-18 14:38:53 -0800
commitea1954af771253660cd84dc73b8f2832327c9c02 (patch)
treefc4ff432663177f70df17343ce72a1ce214f9a43 /hash-lookup.c
parentpull: --ff-only should make it a noop when already-up-to-date (diff)
downloadtgif-ea1954af771253660cd84dc73b8f2832327c9c02.tar.xz
pull: should be noop when already-up-to-date
The already-up-to-date pull bug was fixed for --ff-only but it did not include the case where --ff or --ff-only are not specified. This updates the --ff-only fix to include the case where --ff or --ff-only are not specified in command line flags or config. Signed-off-by: Erwin Villejo <erwin.villejo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hash-lookup.c')
0 files changed, 0 insertions, 0 deletions