From 8b622e4ee1ff4383e2c65e90e30aa4ed28cfe7db Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 3 Sep 2025 10:29:33 +0100
Subject: [PATCH 1/2] Add stub man pages for patchview-based tools

Fixed: #112

Assisted-by: Cursor
---
 .gitignore        | 16 +++++++++++++++-
 Makefile.am       |  7 ++++++-
 NEWS              |  3 +++
 doc/gitdiff.1     |  1 +
 doc/gitdiffview.1 |  1 +
 doc/svndiff.1     |  1 +
 doc/svndiffview.1 |  1 +
 7 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 doc/gitdiff.1
 create mode 100644 doc/gitdiffview.1
 create mode 100644 doc/svndiff.1
 create mode 100644 doc/svndiffview.1

diff --git a/.gitignore b/.gitignore
index afd10fa0..be413779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,21 @@ src/patchview
 /scripts/unwrapdiff
 
 # These are generated from the XML file.
-doc/*.1
+doc/interdiff.1
+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
 
 # Tests
 /test-arena
diff --git a/Makefile.am b/Makefile.am
index 5377c658..4c550675 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,9 @@ 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
@@ -43,11 +46,13 @@ 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)
+man_MANS = $(interdiff_manpage) $(other_manpages) $(additional_manpages)
 
 $(other_manpages): $(interdiff_manpage)
 $(interdiff_manpage): doc/patchutils.xml
 	$(XMLTO) man -o doc $<
+else
+man_MANS = $(additional_manpages)
 endif
 
 # Special rules for combinediff, flipdiff, lsdiff, grepdiff and patchview, which are
diff --git a/NEWS b/NEWS
index 2b165c4c..e39344d4 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ Patchutils news
 	configurations properly. Addresses GitHub issues #61, #91, and #93.
 	Updated spec file.
 
+	Added manual pages for gitdiff, gitdiffview, svndiff, and svndiffview
+	commands. Addresses GitHub issue #112.
+
 0.4.3 (stable)
 
 	Added --in-place option to more tools for editing files in place.
diff --git a/doc/gitdiff.1 b/doc/gitdiff.1
new file mode 100644
index 00000000..7810dd2e
--- /dev/null
+++ b/doc/gitdiff.1
@@ -0,0 +1 @@
+.so patchview.1
diff --git a/doc/gitdiffview.1 b/doc/gitdiffview.1
new file mode 100644
index 00000000..7810dd2e
--- /dev/null
+++ b/doc/gitdiffview.1
@@ -0,0 +1 @@
+.so patchview.1
diff --git a/doc/svndiff.1 b/doc/svndiff.1
new file mode 100644
index 00000000..7810dd2e
--- /dev/null
+++ b/doc/svndiff.1
@@ -0,0 +1 @@
+.so patchview.1
diff --git a/doc/svndiffview.1 b/doc/svndiffview.1
new file mode 100644
index 00000000..7810dd2e
--- /dev/null
+++ b/doc/svndiffview.1
@@ -0,0 +1 @@
+.so patchview.1

From 0eacb2c07098e2f3233de9b0960c6957dafd79d0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 3 Sep 2025 10:30:13 +0100
Subject: [PATCH 2/2] Update .gitignore

---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
index be413779..5acc9515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@ lib/Makefile.in
 
 # Compiled objects
 *.o
+*.gcno
+*.gcda
+*.gcov
 src/combinediff
 src/filterdiff
 src/flipdiff
@@ -31,6 +34,12 @@ src/lsdiff
 src/rediff
 src/patchview
 
+# Build artifacts
+lib-built
+lib/libgnu.a
+lib/*.h
+lib/sys/
+
 # These are generated from *.in files
 /patchutils.spec
 /scripts/dehtmldiff