Skip to content

Commit b382602

Browse files
committed
Update patchview-related man pages
Fixed: #112 Assisted-by: Cursor
1 parent 607e91a commit b382602

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

Makefile.am

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,22 @@ src_interdiff_LDADD = lib/libgnu.a @LIBOBJS@
3636
src_filterdiff_LDADD = lib/libgnu.a @LIBOBJS@
3737
src_rediff_LDADD = lib/libgnu.a @LIBOBJS@
3838

39-
# Manual pages that are simple .so references
40-
additional_manpages = doc/gitdiff.1 doc/gitdiffview.1 doc/svndiff.1 doc/svndiffview.1
41-
4239
if HAVE_XMLTO
4340
# The man pages are generated from DocBook XML.
4441
interdiff_manpage = doc/interdiff.1
4542
other_manpages = doc/filterdiff.1 doc/fixcvsdiff.1 doc/rediff.1 \
4643
doc/editdiff.1 doc/combinediff.1 doc/lsdiff.1 doc/splitdiff.1 \
4744
doc/grepdiff.1 doc/recountdiff.1 doc/unwrapdiff.1 doc/dehtmldiff.1 \
48-
doc/flipdiff.1 doc/espdiff.1 doc/patchview.1
49-
man_MANS = $(interdiff_manpage) $(other_manpages) $(additional_manpages)
45+
doc/flipdiff.1 doc/espdiff.1 doc/patchview.1 \
46+
doc/gitdiff.1 doc/gitdiffview.1 doc/gitshow.1 doc/gitshowview.1 \
47+
doc/svndiff.1 doc/svndiffview.1
48+
man_MANS = $(interdiff_manpage) $(other_manpages)
5049

5150
$(other_manpages): $(interdiff_manpage)
5251
$(interdiff_manpage): doc/patchutils.xml
5352
$(XMLTO) man -o doc $<
5453
else
55-
man_MANS = $(additional_manpages)
54+
man_MANS =
5655
endif
5756

5857
# Special rules for combinediff, flipdiff, lsdiff, grepdiff and patchview, which are

doc/gitdiff.1

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/gitdiffview.1

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/patchutils.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,12 @@ done)]]></screen></para>
13991399
</refmeta>
14001400
<refnamediv>
14011401
<refname>patchview</refname>
1402+
<refname>gitdiff</refname>
1403+
<refname>gitdiffview</refname>
1404+
<refname>gitshow</refname>
1405+
<refname>gitshowview</refname>
1406+
<refname>svndiff</refname>
1407+
<refname>svndiffview</refname>
14021408
<refpurpose>Without options, show numbered files modified by the patch. With options, behave as filterdiff.</refpurpose>
14031409
</refnamediv>
14041410
<refsynopsisdiv>
@@ -1485,7 +1491,7 @@ is equivalent to: lsdiff --number
14851491
is equivalent to: filterdiff -F2- (or whatever arguments are supplied)
14861492
</para>
14871493
<para>
1488-
There are two scripts for working with git (gitdiff and gitdiffview) and two for svn (svndiff and svndiffview).
1494+
There are 4 scripts for working with git repos (gitdiff, gitdiffview, gitshow and gitshowview) and 2 for svn (svndiff and svndiffview).
14891495

14901496
<screen>svndiff</screen>
14911497
<screen>gitdiff</screen>
@@ -1506,6 +1512,10 @@ pipe all patches through filterdiff to vim - -R (in read-only mode, easy to quit
15061512

15071513
will pipe patch of file #2 to vim - -R
15081514
</para>
1515+
<para><screen>gitshow</screen><screen>gitshowview</screen>
1516+
1517+
This is the same as gitdiff but uses git show instead of git diff.
1518+
</para>
15091519
</refsect1>
15101520
<refsect1>
15111521
<title>Options</title>
@@ -1686,7 +1696,7 @@ will pipe patch of file #2 to vim - -R
16861696
<varlistentry>
16871697
<term><option>-v</option>, <option>--verbose</option></term>
16881698
<listitem>
1689-
<para>Verbose output.</para>
1699+
<para>Verbose output. For the git and svn wrapper scripts (gitdiff, gitdiffview, gitshow, gitshowview, svndiff, svndiffview), this option shows the full command that is being executed.</para>
16901700
</listitem>
16911701
</varlistentry>
16921702
<varlistentry>

doc/svndiff.1

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/svndiffview.1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)