chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: intent re record-ffrebase
[dgit.git]
/
NOTES.git-debrebase
diff --git
a/NOTES.git-debrebase
b/NOTES.git-debrebase
index c5b2e23bd794d873d6ea6913386267743efd3b7a..25410284ff86de42d832310e4ad000a4f59d3114 100644
(file)
--- a/
NOTES.git-debrebase
+++ b/
NOTES.git-debrebase
@@
-208,6
+208,10
@@
They should be made just before (ideally, part of) dgit push.
(optionally, can use some other commit which is ff
from all of the above, eg one of them)
+N. git-debrebase record-ffrebase
+
+ does what is described above
+
2. git-debrebase stitch [--noop-ok]
makes pseudomerge with will-overwrite