diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-10 15:01:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-10 15:01:19 -0800 |
| commit | 7c7cf62c485f527bee6d3eb7e37dcfbf8064cab2 (patch) | |
| tree | 1ae588b26347be9651758ca0c3137245f07b0fef /builtin/commit.c | |
| parent | Git 2.34-rc2 (diff) | |
| parent | pull: --ff-only should make it a noop when already-up-to-date (diff) | |
| download | git-7c7cf62c485f527bee6d3eb7e37dcfbf8064cab2.tar.gz git-7c7cf62c485f527bee6d3eb7e37dcfbf8064cab2.zip | |
Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'
"git pull --ff-only" and "git pull --rebase --ff-only" should make
it a no-op to attempt pulling from a remote that is behind us, but
instead the command errored out by saying it was impossible to
fast-forward, which may technically be true, but not a useful thing
to diagnose as an error. This has been corrected.
* jc/fix-pull-ff-only-when-already-up-to-date:
pull: --ff-only should make it a noop when already-up-to-date
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions