| commit | d3236bececc24d4b8ddc736d278ce0d3d5ff12d6 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Wed, 21 Jul 2021 22:15:45 +0000 (21 17:15 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Jul 2021 23:34:06 +0000 (21 16:34 -0700) | ||
| tree | 24801c0b833d1c3f0cf83478c0fbcfe98c50e663 | treesnapshot (tar.gz zip) |
| parent | ebf3c04b262aa27fbb97f8a0156c2347fecafafb | commitdiff |
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>
"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>
| Documentation/git-pull.txt | diffblobblamehistory |