diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:13 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:13 +0900 |
commit | 0c51181ffb178a6581ecb471091cbd2d0c48f165 (patch) | |
tree | 475fe1611bbc83b20280597491f20f2ab3ac50ba /builtin/upload-archive.c | |
parent | Merge branch 'hv/bitshift-constants-in-blame' (diff) | |
parent | rebase: hide --preserve-merges option (diff) | |
download | tgif-0c51181ffb178a6581ecb471091cbd2d0c48f165.tar.xz |
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --preserve-merges" has been marked as deprecated; this
release stops advertising it in the "git rebase -h" output.
* js/rebase-deprecate-preserve-merges:
rebase: hide --preserve-merges option
Diffstat (limited to 'builtin/upload-archive.c')
0 files changed, 0 insertions, 0 deletions