From cf5211fbed449c7668f175eea7d85a5f4eb4a968 Mon Sep 17 00:00:00 2001 From: Fred Bricon Date: Tue, 30 Oct 2012 13:25:37 +0100 Subject: [PATCH 1/2] Add apply-pr alias --- FAQ.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/FAQ.md b/FAQ.md index 5cff7a8..55aa692 100644 --- a/FAQ.md +++ b/FAQ.md @@ -138,7 +138,20 @@ We could actually remove these but we opted for keeping them in for two reasons: 1) It allow us to see which exact svn commit a change is from and can use that to look in the svn repo in case we want to explore for possible bad migration data. 2) svn allows empty commit messages, git does not - if we removed these lines we would have to readjust all the commits that has no message in the history. +# Applying pull-requests without using Github pull request button +Basically you just need to edit .gitconfig to read + + [alias] + apply-pr = "!f() { curl $1.patch | git am --signoff; }; f" + +Or you can use the git config alias command + + git config --global alias.apply-pr "!f() { curl $1.patch | git am --signoff; }; f" + +Then you can just run + + git apply-pr https://github.com/someuser/somerepo/pull/id From 2c588f24b8a2145312084396b982df846942d58a Mon Sep 17 00:00:00 2001 From: Fred Bricon Date: Tue, 30 Oct 2012 13:27:25 +0100 Subject: [PATCH 2/2] Fixed typo --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 55aa692..bd2b8f8 100644 --- a/FAQ.md +++ b/FAQ.md @@ -2,7 +2,7 @@ There are more than a few reasons for this: -1) The big repository made svn slow - it also makes Git slow (yes, its that big!) +1) The big repository made svn slow - it also makes Git slow (yes, it's that big!) 2) We have modules that could just stay untouched between releases, in big repo these had to be rebuilt, in splitup we can move to a build-when-needed approach.