From c008db2aea05d1f661a9a7625c74b65ce2aeab61 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 25 Jun 2019 20:38:08 -0400 Subject: [PATCH] git drama next steps --- misc/git_scripts/git_fetch_merge.bat | 2 -- misc/git_scripts/git_fetch_merge_fork.bat | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 misc/git_scripts/git_fetch_merge.bat create mode 100644 misc/git_scripts/git_fetch_merge_fork.bat diff --git a/misc/git_scripts/git_fetch_merge.bat b/misc/git_scripts/git_fetch_merge.bat deleted file mode 100644 index df4220f84a..0000000000 --- a/misc/git_scripts/git_fetch_merge.bat +++ /dev/null @@ -1,2 +0,0 @@ -git fetch upstream -git merge origin/master \ No newline at end of file diff --git a/misc/git_scripts/git_fetch_merge_fork.bat b/misc/git_scripts/git_fetch_merge_fork.bat new file mode 100644 index 0000000000..ee499e8dbd --- /dev/null +++ b/misc/git_scripts/git_fetch_merge_fork.bat @@ -0,0 +1,2 @@ +git fetch upstream +git merge upstream/master