diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-19 00:52:11 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:00 +0100 |
commit | 75d0b8d7275c035f76db79e7cf7e802e061a9bee (patch) | |
tree | bf09eec163ca78b655c8ef60aaa5e57a8edd8ebc /NOTES.git-debrebase | |
parent | d09d35de46974b3ece2c469f54d898daaa28edf5 (diff) |
git-debrebase(1): wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r-- | NOTES.git-debrebase | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 31c0c1c..79b6f2b 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -84,27 +84,6 @@ We check we are ff from remotes before recording new ffq-prev ---------- now follows much the same info in different words ---------- -1. git-debrebase [-i etc.] - - should: - check for ffq-prev - if is already a ffq-prev, 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 ffq-prev to something which is ff from - all above branches - - 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) - N. git-debrebase [--noop-ok] record-ffq-prev does what is described above |