Differences

This shows you the differences between two versions of the page.

--- git [2023/02/13 11:15]
dblume [Creating a branch (and possibly pushing to upstream origin)]
+++ git [2023/03/21 09:54] (current)
dblume
@@ Line 141: / Line 141: @@
 <code bash>
 git pull --rebase  # --dry-run to test first
+</code>
+====== Applying changes in a stash to a changed file =====
+When ''git stash apply'' doesn't work: Show the stash changes and pipe that to patch. Now you have a patch you can apply.
+<code>
+git stash show -p | patch -p0
 </code>