| commit | 2656eceae7dba180fb59a8ccbb448d8710c9f2d8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 May 2019 17:50:45 +0000 (30 10:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 May 2019 17:50:45 +0000 (30 10:50 -0700) | ||
| tree | fac4449bb696b056a6cf00462d4c174e9ca170e8 | treesnapshot (tar.gz zip) |
| parent | 463dca6476be5f4998f8a836cd8141f58e1b42ee | commitdiff |
| parent | 7948b49ac7be06dd926b5a86e70f7f40f3041899 | commitdiff |
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`
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`
| Documentation/git-rebase.txt | diff1 | diff2 | blobhistory |