summaryrefslogtreecommitdiff
path: root/block-sha1
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2021-07-21 17:15:45 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-21 16:34:06 -0700
commitd3236bececc24d4b8ddc736d278ce0d3d5ff12d6 (patch)
tree24801c0b833d1c3f0cf83478c0fbcfe98c50e663 /block-sha1
parentGit 2.32 (diff)
downloadtgif-d3236bececc24d4b8ddc736d278ce0d3d5ff12d6.tar.xz
doc: pull: fix rebase=false documentation
"git pull --rebase=false" means we merge their history into ours, but it has been described the other way around. Cc: Stephen Haberman <stephen@exigencecorp.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> [jc: updated the log message] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'block-sha1')
0 files changed, 0 insertions, 0 deletions