The $.ajax method does support HTTP PATCH. The problem you are seeing is that the ajax method looks for PATCH in the Access-Control-Allow-Methods response header of the options preflight check. Either this header is missing from your response, or the PATCH method was not included in the value of this header. In either case, the … Read more
printf ‘\x31\xc0\xc3′ | dd of=test_blob bs=1 seek=100 count=3 conv=notrunc dd arguments: of | file to patch bs | 1 byte at a time please seek | go to position 100 (decimal) conv=notrunc | don’t truncate the output after the edit (which dd does by default) One Josh looking out for another 😉
The -u option you used specifies the unified format. In that format the first two lines is a header: — is the original file, +++ is the new file, and the timestamps. @@ block headers That is then followed by chunks (change hunks) that starts with the @@ -R,r +R,r @@ syntax. Those are two … Read more
I’d recommend doing this on a throwaway branch as follows. If your commits are in the “newlines” branch and you have switched back to your “master” branch already, this should do the trick: [adam@mbp2600 example (master)]$ git checkout -b tmpsquash Switched to a new branch “tmpsquash” [adam@mbp2600 example (tmpsquash)]$ git merge –squash newlines Updating 4d2de39..b6768b2 … Read more
Both the input and output are different: git apply takes a patch (e.g. the output of git diff) and applies it to the working directory (or index, if –index or –cached is used). git am takes a mailbox of commits formatted as an email messages (e.g. the output of git format-patch) and applies them to … Read more
You already have a byte array, so you could simply modify the bytes at any given offset. $bytes = [System.IO.File]::ReadAllBytes(“C:\OldFile.exe”) $offset = 23 $bytes[$offset] = 0xFF $bytes[$offset+1] = 0xFF $bytes[$offset+2] = 0xFF [System.IO.File]::WriteAllBytes(“C:\NewFile.exe”, $bytes)
There does not seem to be a solution producing individual commits à la git format-patch, but FWIW, you can format a patch containing the effective merge commit, suitable/compatible with git am: Apparently, the Git Reference guide provides the first hint: git log -p show patch introduced at each commit […] That means for any commit … Read more
you could write a script, which diffs the given tree against a revision range in your repository. assume we first fetch the changed tree (without history) into our own repository: git remote add foreign git://… git fetch foreign we then output the diffstat (in short form) for each revision we want to match against: for … Read more
If manually editing the patch file is out of the question or infeasible, this can be done with standard options (available in git apply, git format-patch and GNU patch). -p<n> removes n leading directories from the paths in the patch. After processing -p, –directory=<root> prepends root to each of the paths in the patch before … Read more
If you’re using git add -p and even after splitting with s, you don’t have a small enough change, you can use e to edit the patch directly. This can be a little confusing, but if you carefully follow the instructions in the editor window that will be opened up after pressing e then you’ll … Read more