Skip to main content

Everyday Git Commands

Git is a free and open source distributed version control system and a great one as well! Easy branch creation and jump between branches are some of its greatest features and here are some common commands that I use most of the time, hope this helps.

Set global settings for user information

$ git config --global "[name]"

$ git config --global "[email address]"

Check status

git status

Clone a project and working with branches

$ git clone [https://repository-link]

$ git checkout [branch-name]

Creating a new branch

$ git checkout -b feature/[branch-name]

$ git checkout -b bugfix/[branch-name]

$ git checkout -b release/[branch-name]

Renaming an existing branch

git branch -m bugfix/[branch-name] feature/[branch-name] --> Long version of renaming a branch (from bugfix to feature in this example)

git branch -m {bugfix,feature}/[branch-name]--> Short version of renaming a branch (from bugfix to feature in this example)

Adding changes for commit

$ git add [file] --> This is for adding a single file, following 2 commands are adding all allowed changed files

$ git add -A

$ git add .

Committing and pushing

$ git commit -m "commit message"

$ git push

$ git push --set-upstream [remote] [branch-name]--> If the branch is newly created.

Changing the most recent commit message

$ git commit --amend -m "new commit message"

Pull, fetch and merge

$ git pull

$ git fetch

$ git checkout [branch-you-want-to-merge-into]

$ git merge [branch-you-want-contents-from]

Reset changes

$ git reset [commit]

$ git reset --hard [last-known-good-commit]

$ git reset --hard HEAD~1 -->Undo the last commit, do not keep the changes.

$ git reset --soft HEAD~1 -->Undo the last commit, keep the changes.

Show all ignored files

$ git status --ignored

Check local, remote and all branches

$ git branch

$ git branch -r

$ git branch -a

Delete a local branch

$ git branch -d feature/branch-name

$ git branch -d bugfix/branch-name

$ git branch -d hotfix/branch-name

Delete a remote branch

$ git push origin --delete feature/branch-name

Tag checking and creation

$ git tag

$ git tag -a [tag-name] -m "tag description"

$ git push origin [tag-name]

Start using SSH in a repository where I am currently using HTTPS

$ git remote set-url origin [email protected]:v3/rest-of-your-project-ssh-url

Stash changes

$ git stash -->Save the un-committed changes in a "stash". This will remove changes from working tree.

$ git stash list -->List the stashes

$ git stash apply -->Apply stash to working tree in current branch

$ git stash apply stash@{0} -->Apply the stash 0 - change the number in order to apply other stashes

$ git stash drop stash@{0} -->Remove the stash 0 from stash list - change the number in order to apply other stashes.

$ git stash pop stash@{1} -->Apply the selected stash and remove it from the stash list.

Show all commits of the current branch as well as the parent branch and its commits

$ git log --first-parent

Exit git log history

$ :q -->For exit

$ :h -->For help


Popular posts from this blog

How to fix Umbraco v9 "Boot Failed : Umbraco failed to boot, if you are the owner of the website please see the log file for more details." error

If you have started working with Umbraco v9 and done your first Azure deployment to one of your testing environments, there is a possibility that you might see the following "Boot Failed" error. Error: Checking the logs In order to understand the problem, you should check the Umbarco log file.  The default location for this file is umbraco/Logs and this file contains the Machine name, along with the date information. You can reach this file via Azure's Kudu Service  or alternatively, you can get download your Azure App Service's publish profile and connect your App Service via an FTP application, i.e. FileZilla. See the FileZilla screen below; Once you get your log file, you can download it to your local machine and open it with a text editor, i.e. Notepad++. When you open it, you will see all logs, including the error message. Please be aware, as most things with Umbraco, logging is also customizable, so you can either use the default Umbraco logging which is Micros

How to use JQuery Ajax Methods for Async ASP.NET MVC Action Methods

Making repeatedly calls to async methods can be a nightmare. In this case, it makes sense to use 2 ajax methods, instead of one. Here is a simple solution to overcome this problem. See that  ajaxcalls   is emptied after the success response for the first ajax call and then the second ajax method is used to make one single call to the async action method. Hope it helps. View: @section Scripts{     < script type ="text/javascript">         var smartDebitObject = new Object();         smartDebitObject.MembershipNumber = $( "#MembershipNumber" ).val();         smartDebitObject.ProfileId = $( "#ProfileId" ).val();         smartDebitObject.FirstName = $( "#FirstName" ).val();         smartDebitObject.LastName = $( "#LastName" ).val();         smartDebitObject.AddressLine1 = $( "#AddressLine1" ).val();         smartDebitObject.Postcode = $( "#Postcode" ).val();         smartDebitObject

Umbraco lifehack: How to setup anchor/jump links in Umbraco without making code changes

Today one of my clients created a ticket asking whether it is possible to set up anchor/jump links for an Umbraco content page so that they could link different sections of the page together. This is a common scenario for most Content editors and it should be super easy with any CMS platform, right? Houston, we got a problem! Now an anchor or page jump link is a special URL that takes you to a specific place on a page and it normally requires a unique HTML element ID to link different parts of a page.  When I investigated my issue, I realised that the page sections of the Umbraco page didn't have unique IDs.  View Source Code comes to the rescue In order to resolve the issue without any code changes, I decided to update the content using the built-in View Source Code feature of Umbraco CMS. This feature is available on built-in property editors, like Rich Text Editor and is super handy for checking the code that Umbraco generates for your Front-end website and making minor adju