diff options
| author | MarcoFalke <[email protected]> | 2019-05-16 13:44:47 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-05-16 13:45:12 -0400 |
| commit | fd7d97decbf4becccf4ccf33d467eee6b21fa76e (patch) | |
| tree | 070c98b2951ed75c62fcc2778b3d3c82254f955e /src/httpserver.cpp | |
| parent | Merge #14047: Add HKDF_HMAC256_L32 and method to negate a private key (diff) | |
| parent | docs: Add productivity notes for "dummy rebases" (diff) | |
| download | discoin-fd7d97decbf4becccf4ccf33d467eee6b21fa76e.tar.xz discoin-fd7d97decbf4becccf4ccf33d467eee6b21fa76e.zip | |
Merge #15820: docs: Add productivity notes for dummy rebases
01971da9bd docs: Add productivity notes for "dummy rebases" (Carl Dong)
Pull request description:
When rebasing, we often want to do a "dummy rebase" whereby we are not rebasing over an updated master. This is because rebases can be confusing enough already, and we don't want to resolve upstream conflicts together with our local rebase conflicts due to fixup commits, commit rearrangements, and such. This productivity section details how to do such "dummy rebase"s.
ACKs for commit 01971d:
Tree-SHA512: 241a451cec01dc9a01a2286bdee1441cac6d28007f5b173345744d2abf436da916c3f2553ff0d1c5b3687055107b37872dda9529288645e4bae7b3cb46923b7e
Diffstat (limited to 'src/httpserver.cpp')
0 files changed, 0 insertions, 0 deletions