aboutsummaryrefslogtreecommitdiff
path: root/content/blog/commands/git-import-commits.md
diff options
context:
space:
mode:
authorJulien Dessaux2023-04-23 22:33:49 +0200
committerJulien Dessaux2023-04-23 22:34:10 +0200
commitea435049b3a3f5057b3a894040df3cf4f3256d9e (patch)
tree9046430870fa050e6568fcfbe409f8a8d295d0b3 /content/blog/commands/git-import-commits.md
parentDocument the second gotosocial backup job (diff)
downloadwww-ea435049b3a3f5057b3a894040df3cf4f3256d9e.tar.gz
www-ea435049b3a3f5057b3a894040df3cf4f3256d9e.tar.bz2
www-ea435049b3a3f5057b3a894040df3cf4f3256d9e.zip
Refactored syntax highlighting shortcodes into markdown
Diffstat (limited to 'content/blog/commands/git-import-commits.md')
-rw-r--r--content/blog/commands/git-import-commits.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/blog/commands/git-import-commits.md b/content/blog/commands/git-import-commits.md
index 0286282..bb92b26 100644
--- a/content/blog/commands/git-import-commits.md
+++ b/content/blog/commands/git-import-commits.md
@@ -9,6 +9,6 @@ tags:
## The trick
In an ideal world there should never be a need to do this, but here is how to do it properly if you ever walk into this bizarre problem. This command imports commits from a repo in the `../masterfiles` folder and applies them to the repository inside the current folder :
-{{< highlight sh >}}
+```sh
(cd ../masterfiles/; git format-patch –stdout origin/master) | git am
-{{< /highlight >}}
+```