diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 10:50:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 10:50:45 -0700 |
| commit | 2656eceae7dba180fb59a8ccbb448d8710c9f2d8 (patch) | |
| tree | fac4449bb696b056a6cf00462d4c174e9ca170e8 /diff.c | |
| parent | Merge branch 'sg/trace2-rename' (diff) | |
| parent | rebase docs: recommend `-r` over `-p` (diff) | |
| download | git-2656eceae7dba180fb59a8ccbb448d8710c9f2d8.tar.gz git-2656eceae7dba180fb59a8ccbb448d8710c9f2d8.zip | |
Merge branch 'js/rebase-deprecate-preserve-merges'
A bit more leftover clean-up to deprepcate "rebase -p".
* js/rebase-deprecate-preserve-merges:
rebase docs: recommend `-r` over `-p`
docs: say that `--rebase=preserve` is deprecated
tests: mark a couple more test cases as requiring `rebase -p`
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions