summaryrefslogtreecommitdiff
path: root/NOTES.git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-10 17:39:25 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commite30ef7e22058744d48aa1bfa507d7bac17e3ba89 (patch)
treeb60bd3ea2ee3f84958d27952ea971dd166827dd7 /NOTES.git-debrebase
parent7c3763c866d9cca28d2f4d2368028d708694e3e9 (diff)
git-debrebase: notes re psuedomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r--NOTES.git-debrebase30
1 files changed, 30 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index e0a67b5..0310f96 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -174,6 +174,36 @@ so that the overall result will be series of pseudomerges.
========================================
+So, pm handling specifics:
+
+1. git-debrebase [-i etc.]
+
+ should:
+ check for will-overwrite
+ if is already a will-overwrite, fine, do no more
+ if not:
+
+ check our origin branch exists and we are ff from it
+ if not fail
+
+ check our other might-be-pushed to branches
+ check we are ff from them
+ if not fail
+
+ 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
+
+2. git-debrebase stitch
+
+ makes pseudomerge with will-overwrite
+ deletes will-overwrite
+
+========================================
+
import from gbp
[ all this is done now: