From: Tomi Ollila Date: Sat, 12 May 2012 08:46:01 +0000 (+0300) Subject: nii X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=commitdiff_plain;h=2e9ffeb0066ca22b315bacbd706a8ea2b1f9fd66 nii --- 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