From 2b7f92fe7a646f55dbb0fcb38001f5afa8d4d321 Mon Sep 17 00:00:00 2001
From: Levi Neely <lneely@pascom.net>
Date: Thu, 9 Apr 2026 17:29:44 +0200
Subject: [PATCH] add Gdb, Gdbs scripts for diff against merge-base

---
 git/Gdb  | 6 ++++++
 git/Gdbs | 6 ++++++
 mkfile   | 4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 git/Gdb
 create mode 100755 git/Gdbs

diff --git a/git/Gdb b/git/Gdb
new file mode 100755
index 0000000..1ce0e55
--- /dev/null
+++ b/git/Gdb
@@ -0,0 +1,6 @@
+#!/usr/bin/env rc
+base=`{git merge-base HEAD origin/`{git symbolic-ref refs/remotes/origin/HEAD | sed 's|refs/remotes/origin/||'}}
+if(~ $#samfile 0)
+	git diff $base
+if not
+	git diff $base -- $samfile
diff --git a/git/Gdbs b/git/Gdbs
new file mode 100755
index 0000000..f5821a9
--- /dev/null
+++ b/git/Gdbs
@@ -0,0 +1,6 @@
+#!/usr/bin/env rc
+base=`{git merge-base HEAD origin/`{git symbolic-ref refs/remotes/origin/HEAD | sed 's|refs/remotes/origin/||'}}
+if(~ $#samfile 0)
+	git diff --stat $base
+if not
+	git diff --stat $base -- $samfile
diff --git a/mkfile b/mkfile
index 13b33bb..248dd1c 100644
--- a/mkfile
+++ b/mkfile
@@ -7,6 +7,8 @@ install:V:
 	cp git/Gdif $HOME/bin/Gdif
 	cp git/Gdifs $HOME/bin/Gdifs
 	cp git/Gdn $HOME/bin/Gdn
+	cp git/Gdb $HOME/bin/Gdb
+	cp git/Gdbs $HOME/bin/Gdbs
 	cp git/Gds $HOME/bin/Gds
 	cp git/Gf $HOME/bin/Gf
 	cp git/Glog $HOME/bin/Glog
@@ -16,4 +18,4 @@ install:V:
 	cp php/Phpl $HOME/bin/Phpl
 
 clean:V:
-	rm -f $HOME/bin/G+ $HOME/bin/G++ $HOME/bin/G- $HOME/bin/G-- $HOME/bin/Gc $HOME/bin/Gdif $HOME/bin/Gdifs $HOME/bin/Gdn $HOME/bin/Gds $HOME/bin/Gf $HOME/bin/Glog $HOME/bin/Gpat $HOME/bin/Gst $HOME/bin/Gup $HOME/bin/Phpl
+	rm -f $HOME/bin/G+ $HOME/bin/G++ $HOME/bin/G- $HOME/bin/G-- $HOME/bin/Gc $HOME/bin/Gdb $HOME/bin/Gdbs $HOME/bin/Gdif $HOME/bin/Gdifs $HOME/bin/Gdn $HOME/bin/Gds $HOME/bin/Gf $HOME/bin/Glog $HOME/bin/Gpat $HOME/bin/Gst $HOME/bin/Gup $HOME/bin/Phpl