X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=blobdiff_plain;f=patchformatting.mdwn;h=dda840feb96e5cfdc939a95d71cef27a9a533645;hp=e748395aee639b471d6b841f02819b75e8734d25;hb=f5ddc01eb0181124a8449a12afe2587e2304e6fb;hpb=67f3971884c0ca841f50438bce7678c0f205b025 diff --git a/patchformatting.mdwn b/patchformatting.mdwn index e748395..dda840f 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