diff options
| -rw-r--r-- | NOTES.git-debrebase | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 0310f96..6a731f1 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -176,6 +176,17 @@ so that the overall result will be series of pseudomerges. So, pm handling specifics: +strategy is to avoid making needless pseudomerges +pseudomerges that exist will be preserved +(by being included in will-overwrite) + +This is good because the presence of a pseudomerge means we know we +want to keep it; and that allows explicit control over history detail +level. + +It does mean we must avoid making the pseudomerges unnecessarily. +They should be made just before (ideally, part of) dgit push. + 1. git-debrebase [-i etc.] should: @@ -192,10 +203,10 @@ So, pm handling specifics: set will-overwrite to something which is ff from all above branches - either 1. one of them or, if there is no maximal one, - 2. our tip - ? optionally, according to config always take tip anyway + we use our tip, as discussed above + (optionally, can use some other commit which is ff + from all of the above, eg one of them) 2. git-debrebase stitch |