git.rinkkasatiainen.fi

Github pages - my own learning diary


View My GitHub Profile

Using Git

This is how I use git

My git workflow:

  1. Checkout from the repository > create .gitignore file
  2. 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
  3. 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 > - copy changed files to server
  4. How to use branches > - viewing what branches there are available > - merging branches > - rebasing branches > - moving branches > - delete branches
  5. Sometimes I make mistakes and then I need to: > - fix my commit > - add files to last commit > - removing files from GIT source control, but not from
  6. Conflicts > - What to do?
  7. Fixing branches
  8. Pushing changes to repository > - never use push -f
  9. Great success in working with multiple remotes > - copying new commits from SVN to git > - merging branches from other remote