Skip to content

Commit 472303f

Browse files
committed
remove arg and no upstream change
1 parent 6358503 commit 472303f

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

specs/git/rebase_master_into_current_branch.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
---
2-
name: Set master as upstream and rebase master into feature branch
2+
name: Rebase master into feature branch
33
command: |-
4-
git branch -u master
54
git checkout master
6-
git pull
7-
git checkout {{featurebranch}}
8-
git pull --rebase
5+
git pull origin master
6+
git checkout -
7+
git pull origin master --rebase
98
tags:
109
- git
1110
description: Rebases master into the feature branch
12-
arguments:
13-
- name: featurebranch
14-
description: The branch name that you're currently developing on
15-
default_value: ~
11+
arguments: []
1612
source_url: ""
1713
author: Zheng Tao
1814
author_url: "https://www.linkedin.com/in/zheng-tao-2b7b2855"

0 commit comments

Comments
 (0)