Git: Rework patch commands.

home/program/bash/module/Git.nix

@@ -123,22 +123,34 @@
 			git ls-files -ci --exclude-standard -z | xargs -0 git rm --cached
 		}
 
-		# Git patch create.
+		# Git patch from staged diff.
-		# Usage: gpc > <FILE>
+		# Usage: gpd
-		function gpc() {
+		function gpd() {
-			git diff --staged --patch --binary
+			git diff --staged --patch --binary --minimal
 		}
 
-		# Git patch (apply).
+		# Git patch from commit.
-		# Usage: gp <FILE>
+		# Usage: gpc [REF] [COUNT]
-		function gp() {
+		function gpc() {
+			local ref="''${1}"
+			local count="''${2}"
+			[[ "''${ref}" = "" ]] && ref="HEAD"
+			[[ "''${count}" = "" ]] && count=1
+			git format-patch --stdout --minimal --patch --binary -''${count} "''${ref}"
+		}
+
+		# Git patch apply.
+		# Usage: gpa <FILE>
+		function gpa() {
 			git apply --index "''${@}"
 		}
 
 		# Unstage changes.
-		# Usage: grs <FILES>
+		# Usage: grs [FILES]
 		function grs() {
-			git restore --staged "''${@}"
+			local target=''${@}
+			[[ "''${target}" = "" ]] && target="."
+			git restore --staged "''${target}"
 		}
 
 		# Run git garbage collection.
@@ -155,10 +167,7 @@
 		# Usage: ga [FILES]
 		function ga() {
 			local target=''${@}
-
+			[[ "''${target}" = "" ]] && target="."
-			if [[ "''${target}" = "" ]]; then
-				target="."
-			fi
 
 			git diff ''${target}
 			git add ''${target}