chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dgit/dgit/experimental' into HEAD
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index 6168e144dc057e50c96c0c5c7f34747d81373f56..1c3e68128f0e4967e90d1bb9e219b43b075e57a9 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-15,11
+15,11
@@
Debian packages based on upstream source code.
This is the command line reference.
Please read the tutorial
This is the command line reference.
Please read the tutorial
-L<dgit-maint-debrebase(
5
)>.
+L<dgit-maint-debrebase(
7
)>.
For background, theory of operation,
and definitions see L<git-debrebase(5)>.
For background, theory of operation,
and definitions see L<git-debrebase(5)>.
-You should read this manpage in co
nj
unction with
+You should read this manpage in co
jn
unction with
L<git-debrebase(5)/TERMINOLOGY>,
which defines many important terms used here.
L<git-debrebase(5)/TERMINOLOGY>,
which defines many important terms used here.
@@
-57,10
+57,10
@@
to distinguish them from options for git-debrebase.
=item git-debrebase status
=item git-debrebase status
-Analy
ise
the current branch,
-both in terms of its conents,
+Analy
ses
the current branch,
+both in terms of its con
t
ents,
and the refs which are relevant to git-debrebase,
and the refs which are relevant to git-debrebase,
-and print a human-readable summary.
+and print
s
a human-readable summary.
Please do not attempt to parse the output;
it may be reformatted or reorganised in the future.
Please do not attempt to parse the output;
it may be reformatted or reorganised in the future.
@@
-343,7
+343,7
@@
Turns snag(s) with id <snag-id> into warnings.
Some troublesome things which git-debrebase encounters
are B<snag>s.
(The specific instances are discussed
Some troublesome things which git-debrebase encounters
are B<snag>s.
(The specific instances are discussed
-in the text for the relvant operation.)
+in the text for the rel
e
vant operation.)
When a snag is detected,
a message is printed to stderr containing the snag id
When a snag is detected,
a message is printed to stderr containing the snag id