Using Git
This is how I use git
My git workflow:
- Checkout from the repository
> create .gitignore file
- Basic workflow
> - I just created a new file - how to add that to staging area?
> - At this time, I keep on coding. And doing many commits - one every 2 minutes
> - I keep my camp ground clean - git rebase
> - I want to see history
- Special workflow
> - Create a local development branch - feature branch
> - My friend created a feature branch - how to fetch that
> - I need to make a quick fix to fix that one small thing. (stash, checkout -b)
> - cherry-pick. I need those fixes to this branch too
- How to use branches
> - viewing what branches there are available
> - merging branches
> - rebasing branches
> - moving branches
> - delete branches
- Sometimes I make mistakes and then I need to:
> - fix my commit
> - add files to last commit
- Conflicts
- Fixing branches
- Pushing changes to repository
> - never use push -f