Archives May 2017

Article / Entry section

Terminology section

Git push updates the remote repository with any commits made in the local branch. Example code:

git push 'remote-branch-name' 'local-branch-name'

Git pull updates the local branch with updates from its remote counterpart. This command is particularly useful when working with teams as you can update your local code with any changes that have been made/accepted on the remote branch. Example code:

git pull remote branch name local branch name

Git merge combines two branches together. The git merge command is powerful in that it can recognize and mark any conflicts that it finds so they can be corrected manually.

Git status shows the status of changes in the current working tree. The status of a file may be untracked, modified, or staged. (Only staged changes will be committed by the git commit command.)

A Git commit is a snapshot of changes on the current working branch. The commit tracks the changes that were staged and has a message that allows the developer to describe the changes made in that particular commit. A branch can contain many commits. Example code:

git commit -m 'Change background to blue'

A Git branch is a line of development in the repository. Branches are used to isolate working on different features, versions or environments. The main branch is called the master branch and is where all other branches merge into.

Daily archives

Previous month

March 2017

Next month

September 2017