Git Patch Utility

Git Patch Utility

This exension helps to create and apply the patch file by comparing another branch or by using last N commits from the local branch, show or clean the untracked files and opens a conflicted file in a merge tool.

Create Git Patch File

1. Go to Command Palette.
2. Search for "Git Patch Utility: Create Git Patch File".
   • By comparing another branch
     • Specify the branch name to compare.
     • Specify the folder name for the patch file.
     • Specify the name for the patch file.
   • Using Last N Commits
     • Specify the number of commits.
     • Specify the folder name for the patch file.

Apply Git Patch

1. Right click on any patch file.
2. Choose "Git Patch Utility: Apply Git Patch File".
   • Choose "Verify Patch" to verify whether the patch will apply cleanly. (or)
   • Choose "Apply Patch" to apply the patch. (or)
   • Choose "Apply Patch if patch does not apply cleanly" for applying the patch file in case of conflicts.

Open Using Git Merge Tool

1. Right click on the conflicted file which was generated using Apply Patch if patch does not apply cleanly to resolve the conflicts using your favourite merge tool.
2. Choose "Git Patch Utility: Open Using Git Merge Tool".
3. The merge tool will be opened using the configuration specified in the GIT configuration.

Perform GIT Clean (Show Files / Force Clean)

1. Go to Command Palette.
2. Search "Git Patch Utility: Perform GIT Clean".
   • Choose "Show Files" to show untracked files in the local branch.
   • Choose "Force Clean" to clean the untracked files in the local branch.