diff options
| author | Gereon Kremer <nafur42@gmail.com> | 2021-06-02 08:29:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 06:29:02 +0000 |
| commit | 444487219984b510bfe8c95c25fd8d28466551d5 (patch) | |
| tree | 67f61e0bd44191360690b503e645809c8f775217 /src/options/printer_modes.h | |
| parent | 245d3383c2f463b07987f2758af28871fe753de9 (diff) | |
Do manual squash cleanup for docs (#6646)
This PR abandons the attempt to do the cleanup in a single rebase command, and instead squashes the old commits manually. The current solution does not handle conflicts properly. The new approach (which seems to be more robust) proceeds as follows (to squash $first..$last):
- checkout $last
- soft reset to $first (checkout $first, but keep changes in working copy)
- commit to squashed commit
- cherry-pick $last..HEAD from main branch
Diffstat (limited to 'src/options/printer_modes.h')
0 files changed, 0 insertions, 0 deletions