knowledge
/
git-tips
mirror of https://github.com/namibia/tips.git
1
0
Fork 0
Code Issues Releases Activity

Fixed #117

This commit is contained in:
Hemanth.HM 2016-08-15 23:43:07 +05:30
parent 9f75591eef
commit 3357955baa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -534,7 +534,7 @@ git branch -m [<old-branch-name>] <new-branch-name>
## Rebases 'feature' to 'master' and merges it in to master
```sh
git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}
git rebase master feature && git checkout master && git merge -
```
## Archive the `master` branch

2
tips.json
View File

@ -185,7 +185,7 @@
"alternatives": ["git branch -m [<old-branch-name>] <new-branch-name>"]
}, {
"title": "Rebases 'feature' to 'master' and merges it in to master ",
"tip": "git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}"
"tip": "git rebase master feature && git checkout master && git merge -"
}, {
"title": "Archive the `master` branch",
"tip": "git archive master --format=zip --output=master.zip"