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