summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorErwin Villejo <erwin.villejo@gmail.com>2021-11-17 07:55:50 +0000
committerJunio C Hamano <gitster@pobox.com>2021-11-18 14:38:53 -0800
commitea1954af771253660cd84dc73b8f2832327c9c02 (patch)
treefc4ff432663177f70df17343ce72a1ce214f9a43 /commit.h
parent361cb52383fb986f76a34506bdec9a1dd11133f0 (diff)
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 'commit.h')
0 files changed, 0 insertions, 0 deletions