X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=patchformatting.mdwn;h=dac2c2d726548875af7a46bd0c94804419c17130;hb=2e9ffeb0066ca22b315bacbd706a8ea2b1f9fd66;hp=dda840feb96e5cfdc939a95d71cef27a9a533645;hpb=f5ddc01eb0181124a8449a12afe2587e2304e6fb;p=obsolete%2Fnotmuch-wiki diff --git a/patchformatting.mdwn b/patchformatting.mdwn index dda840f..dac2c2d 100644 --- a/patchformatting.mdwn +++ b/patchformatting.mdwn @@ -139,7 +139,7 @@ test-apply your patch files on origin/master: git reset --hard origin/master git pull git am 00* - + git reset --hard `cat head_commit` git stash apply rm head_commit