summaryrefslogtreecommitdiff
path: root/builtin/upload-archive.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-05-28 05:42:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-28 13:22:35 -0700
commit7948b49ac7be06dd926b5a86e70f7f40f3041899 (patch)
tree4869569ea21baabb444ed8eccbf9601311acec58 /builtin/upload-archive.c
parentdocs: say that `--rebase=preserve` is deprecated (diff)
downloadtgif-7948b49ac7be06dd926b5a86e70f7f40f3041899.tar.xz
rebase docs: recommend `-r` over `-p`
The `--preserve-merges` option is now deprecated in favor of `--rebase-merges`; Let's stop recommending the former. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/upload-archive.c')
0 files changed, 0 insertions, 0 deletions