chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: update-vcs-git: Do not crash if url is unchanged
[dgit.git]
/
git-debrebase.5.pod
diff --git
a/git-debrebase.5.pod
b/git-debrebase.5.pod
index c30b124dea9d7cf254107f32827a17fc9a4e2682..8209fc19fc7d08ef2e8829d9e9df4b4f03abc128 100644
(file)
--- a/
git-debrebase.5.pod
+++ b/
git-debrebase.5.pod
@@
-190,7
+190,7
@@
and the user's work
can later be
stitched into the fast-forwarding interchange form.
can later be
stitched into the fast-forwarding interchange form.
-An unstitched branch may be in
the
+An unstitched branch may be in
B<laundered>
state,
which means it has a more particular special form
B<laundered>
state,
which means it has a more particular special form
@@
-391,7
+391,7
@@
general merges on any of the relevant branches.
For this reason the tools will try to help the user
avoid divergence of the interchange branch.
For this reason the tools will try to help the user
avoid divergence of the interchange branch.
-See dgit-maint-rebase(7)
+See dgit-maint-
deb
rebase(7)
for a discussion of what kinds of behaviours
should be be avoided
because
for a discussion of what kinds of behaviours
should be be avoided
because