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: merge: test conflict: Break out no-wreckage
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index 28f3084816064107440ab23f938091d4079269c1..fe65674735838fa3fe67566a5edf62e6550170bc 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-111,6
+111,8
@@
because that launders the branch too.
Throws away all the work since the branch was last stitched.
This is done by rewinding you to ffq-prev.
Throws away all the work since the branch was last stitched.
This is done by rewinding you to ffq-prev.
+If you are in the middle of a git-rebase, will abort that too.
+
=item git-debrebase new-upstream <new-version> [<upstream-details>...]
Rebases the delta queue
=item git-debrebase new-upstream <new-version> [<upstream-details>...]
Rebases the delta queue