I use GitHub everyday. I don’t like the UI, it’s slow and cumbersome. So instead I use a combination of Powershell and posh-git; it’s the only tools I use. In this article I’m going to show you how to create shortcut commands like merge2master and merge2dev that automate the repeatable tasks of maintaining a development and master branch with GitHub.
Tag: git
-
Git pull rebase recovery
Using git pull –rebase is a great way to avoid those awkward looking commits of Merge branch ‘development’ of in the list of commits. Very difficult to read the actual deltas. Performing a Git rebase helps solve this. However, from time-to-time I’ve received conflicts and could not figure out how to fix the rebase and carry on. Scariest moments of my life. Luckily I’ve been able to recover from this.
-
Merge one or more Git commits into a different branch
Problem
You have a commit that you want to move from one branch to the other. This is commonly required when there are additional commits in the branch where your commit is, so you are unable to merge the entire branch.
Solution
-
Git – Squashing multiple commits into one when merging a branch
When you are using Github, it’s quite common to branch your work while working on a feature. Many times your branch contains a lot of small commits that when you merge it into your main branch you want a single commit message describing the full work in that branch.
Git offers a handy command called git merge –squash [your-branch]. This is then a followed by a regular git commit and git push.
-
Cloning or Checking out a repository with GIT
You have your own GIT repository or you wish to checkout a copy of a publicly or privately available repository to your computer.
To checkout or as GIT calls it, clone, a repository the git clone command. This command accepts many different arguments. In your command line, type: git help clone for the full supported list.