diff options
| author | Julia Evans <julia@jvns.ca> | 2025-10-15 13:13:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 13:17:52 -0700 |
| commit | 59b28f928b2b3b91033ee4e9cbe0cf51a781e55b (patch) | |
| tree | 7a399b6c454a22dc49d8cb37e0f2a37ea27fdb2a /t/unit-tests/test-lib.h | |
| parent | 85abbfc59b070816871ff64bba3eba94e749ce08 (diff) | |
doc: git-pull: clarify options for integrating remote branch
From user feedback:
- One user is confused about the current default ("I was convinced that
the git default was still to merge on pull")
- One user is confused about why "git fetch" isn't mentioned earlier
- One user says they always forget what the arguments to `git pull` are
and that it's not immediately obvious that `--no-rebase` means "merge"
- One user wants `--ff-only` to be mentioned
Resolve this by listing the options for integrating the the remote
branch. This should help users figure out at a glance which one they
want to do, and make it clearer that --ff-only is the default.
Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/unit-tests/test-lib.h')
0 files changed, 0 insertions, 0 deletions