You are here |
vladimirzdrazil.com | ||
| | | |
betterdev.blog
|
|
| | | | No upstream branch error from Git push command may seem strange. Here I explain it and show how to simplify first branch push to avoid it. | |
| | | |
honza.pokorny.ca
|
|
| | | | Thoughts of an open source developer with a theology degree. Honza Pokorný is a web developer and an armchair theologian in Halifax, Canada | |
| | | |
blog.kulman.sk
|
|
| | | | I use the same machines to work on both personal and work projects. I usually have to use a different Git identity for the work projects than for my personal projects. Previously I had my personal Git identity set globally and then used local Git configs to override it in work projects. This worked just fine but it was too much work. There is a better solution. Git config allows you to use, or better to say include, another Git config for a specific directory and all its subdirectories. I have all my pro... | |
| | | |
www.integralist.co.uk
|
|
| | Introduction git merge git merge --no-ff --edit git reset Force the merge commit git branch --contains Losing useful history git merge --squash git rebase git rebase --interactive git rebase --onto git format-patch Conclusion Introduction Imagine I have a master branch with one commit: 75eb1cb - (origin/master) README This is a single README.md file with the following content: - A: 1 Now imagine I have a branch from master called feat/foo and in that branch I've made 3 additional commits: |