ranieribt
/ .gitignore_global
Last active
September 29, 2017 13:50
— forked from octocat/.gitignore
Some common .gitignore configurations
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # | |
| # Global .gitignore Flle | |
| # Reference: http://help.github.com/ignore-files/ | |
| # Save this in a file: ~/.gitignore_global | |
| # Then at the command line (you will see more info if a repo is in the current folder): | |
| # git config --global core.excludesfile ~/.gitignore_global | |
| # git config --list | |
| # | |
| # Compiled source # |
ranieribt
/ git-merge-better_branch.txt
Created
July 8, 2017 21:45
Make the current git branch a master branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git checkout better_branch | |
| git merge --strategy=ours master # keep the content of this branch, but record a merge | |
| git checkout master | |
| git merge better_branch # fast-forward master up to the merge |