diff options
| author | Julia Evans <julia@jvns.ca> | 2025-10-15 13:13:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 13:17:52 -0700 |
| commit | d8942ac494fb08b5b99a3eb6fb6a2853a0232d21 (patch) | |
| tree | c7b1d3f2a7aa2fbc7af821713c1a9a52bbfe054e /diff.c | |
| parent | doc: git-pull: clarify options for integrating remote branch (diff) | |
| download | git-d8942ac494fb08b5b99a3eb6fb6a2853a0232d21.tar.gz git-d8942ac494fb08b5b99a3eb6fb6a2853a0232d21.zip | |
doc: git-pull: delete the example
From user feedback: this example is confusing because it implies that
`git pull` will run `git merge` by default, but the default is
`--ff-only`.
We could instead show an example of a fast-forward merge, but that may
not add a lot since fast-forward merges are relatively simple. This lets
us keep the description short.
Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions