aboutsummaryrefslogtreecommitdiff
path: root/content/blog/commands/git-import-commits.md
diff options
context:
space:
mode:
authorJulien Dessaux2021-03-11 19:47:26 +0100
committerJulien Dessaux2021-03-11 19:47:26 +0100
commit1a4981a826bb94c478c6f49721396ec03e02649c (patch)
treecbd779f6f8e36a28f4d6bd2788c21ce10d9ef122 /content/blog/commands/git-import-commits.md
parentSeveral fixes (diff)
downloadwww-1a4981a826bb94c478c6f49721396ec03e02649c.tar.gz
www-1a4981a826bb94c478c6f49721396ec03e02649c.tar.bz2
www-1a4981a826bb94c478c6f49721396ec03e02649c.zip
First big articles reformatting now that I properly understand hugo
Diffstat (limited to 'content/blog/commands/git-import-commits.md')
-rw-r--r--content/blog/commands/git-import-commits.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/content/blog/commands/git-import-commits.md b/content/blog/commands/git-import-commits.md
index 5ec2bc1..0286282 100644
--- a/content/blog/commands/git-import-commits.md
+++ b/content/blog/commands/git-import-commits.md
@@ -1,13 +1,14 @@
---
title: "Import commits from one git repo to another"
-linkTitle: "Import commits from one git repo to another"
date: 2018-09-25
-description: >
- Import commits from one git repo to another
+description: How to take commits from one git repo and bring them into another
+tags:
+ - git
---
-This imports commits from a repo in the `../masterfiles` folder and applies them to the repository inside the current folder :
+## 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 >}}
(cd ../masterfiles/; git format-patch –stdout origin/master) | git am
{{< /highlight >}}
-