Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,22 @@ src_interdiff_LDADD = lib/libgnu.a @LIBOBJS@
src_filterdiff_LDADD = lib/libgnu.a @LIBOBJS@
src_rediff_LDADD = lib/libgnu.a @LIBOBJS@

# Manual pages that are simple .so references
additional_manpages = doc/gitdiff.1 doc/gitdiffview.1 doc/svndiff.1 doc/svndiffview.1

if HAVE_XMLTO
# The man pages are generated from DocBook XML.
interdiff_manpage = doc/interdiff.1
other_manpages = doc/filterdiff.1 doc/fixcvsdiff.1 doc/rediff.1 \
doc/editdiff.1 doc/combinediff.1 doc/lsdiff.1 doc/splitdiff.1 \
doc/grepdiff.1 doc/recountdiff.1 doc/unwrapdiff.1 doc/dehtmldiff.1 \
doc/flipdiff.1 doc/espdiff.1 doc/patchview.1
man_MANS = $(interdiff_manpage) $(other_manpages) $(additional_manpages)
doc/flipdiff.1 doc/espdiff.1 doc/patchview.1 \
doc/gitdiff.1 doc/gitdiffview.1 doc/gitshow.1 doc/gitshowview.1 \
doc/svndiff.1 doc/svndiffview.1
man_MANS = $(interdiff_manpage) $(other_manpages)

$(other_manpages): $(interdiff_manpage)
$(interdiff_manpage): doc/patchutils.xml
$(XMLTO) man -o doc $<
else
man_MANS = $(additional_manpages)
man_MANS =
endif

# Special rules for combinediff, flipdiff, lsdiff, grepdiff and patchview, which are
Expand Down
1 change: 0 additions & 1 deletion doc/gitdiff.1

This file was deleted.

1 change: 0 additions & 1 deletion doc/gitdiffview.1

This file was deleted.

14 changes: 12 additions & 2 deletions doc/patchutils.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1399,6 +1399,12 @@ done)]]></screen></para>
</refmeta>
<refnamediv>
<refname>patchview</refname>
<refname>gitdiff</refname>
<refname>gitdiffview</refname>
<refname>gitshow</refname>
<refname>gitshowview</refname>
<refname>svndiff</refname>
<refname>svndiffview</refname>
<refpurpose>Without options, show numbered files modified by the patch. With options, behave as filterdiff.</refpurpose>
</refnamediv>
<refsynopsisdiv>
Expand Down Expand Up @@ -1485,7 +1491,7 @@ is equivalent to: lsdiff --number
is equivalent to: filterdiff -F2- (or whatever arguments are supplied)
</para>
<para>
There are two scripts for working with git (gitdiff and gitdiffview) and two for svn (svndiff and svndiffview).
There are 4 scripts for working with git repos (gitdiff, gitdiffview, gitshow and gitshowview) and 2 for svn (svndiff and svndiffview).

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

will pipe patch of file #2 to vim - -R
</para>
<para><screen>gitshow</screen><screen>gitshowview</screen>

This is the same as gitdiff but uses git show instead of git diff.
</para>
</refsect1>
<refsect1>
<title>Options</title>
Expand Down Expand Up @@ -1686,7 +1696,7 @@ will pipe patch of file #2 to vim - -R
<varlistentry>
<term><option>-v</option>, <option>--verbose</option></term>
<listitem>
<para>Verbose output.</para>
<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>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
1 change: 0 additions & 1 deletion doc/svndiff.1

This file was deleted.

1 change: 0 additions & 1 deletion doc/svndiffview.1

This file was deleted.