| commit | ea1954af771253660cd84dc73b8f2832327c9c02 | |
| author | Erwin Villejo <erwin.villejo@gmail.com> | |
| Wed, 17 Nov 2021 07:55:50 +0000 (17 07:55 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Nov 2021 22:38:53 +0000 (18 14:38 -0800) | ||
| tree | fc4ff432663177f70df17343ce72a1ce214f9a43 | treesnapshot (tar.gz zip) |
| parent | 361cb52383fb986f76a34506bdec9a1dd11133f0 | commitdiff |
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>
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>
| builtin/pull.c | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |