Git Patch Workflow

Git Patch Workflow

Creating Patch Files

Method 1: From Unstaged Changes

cd /path/to/repo
git diff path/to/file.java > /path/to/patch/fix.patch

Method 2: From Staged Changes

git diff --cached > /path/to/patch/fix.patch

Method 3: From Commits

# Create patch from last N commits
git format-patch -N HEAD

# Create patch from specific commit
git show COMMIT_HASH > /path/to/patch/fix.patch

Patch File Structure

A unified diff patch looks like:

--- a/original/path/file.java
+++ b/modified/path/file.java
@@ -10,5 +10,6 @@ class MyClass {
     // context line
-    old code here
+    new code here
     // context line

Key components:

• --- prefix: original file
• +++ prefix: modified file
• @@ markers: line numbers and context
• - prefix: removed lines
• + prefix: added lines
• No prefix: context lines

Applying Patches

Basic Application

cd /path/to/repo
patch -p1  patch1.patch
git diff HEAD~1 HEAD > patch2.patch

# Apply in sequence
patch -p1 < patch1.patch
patch -p1 < patch2.patch

Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

• Author: cxcscmu
• Source: cxcscmu/SkillLearnBench
• License: MIT
• Homepage: https://cxcscmu.github.io/SkillLearnBench

Install and usage instructions live in the source repository linked above.