diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-06-18 13:25:28 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-21 09:38:29 -0700 |
| commit | 3883c55138dcfbe2d9a24e3f93a2a4b1d376dde6 (patch) | |
| tree | 65dfcd9a7b60ec6a7b8cfce202a13c4ed1a85d22 /Documentation/git-merge-one-file.txt | |
| parent | fetch: warn about forced updates in branch listing (diff) | |
| download | tgif-3883c55138dcfbe2d9a24e3f93a2a4b1d376dde6.tar.xz | |
pull: add --[no-]show-forced-updates passthrough
The 'git fetch' command can avoid calculating forced updates, so
allow users of 'git pull' to provide that option. This is particularly
necessary when the advice to use '--no-show-forced-updates' is given
at the end of the command.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions