Difference between revisions of "Git command summary"

From Jens' Hjørne
Jump to navigation Jump to search
m
m
Line 2: Line 2:
 
Editing the global configuration:
 
Editing the global configuration:
 
  $'''git config --global --edit'''
 
  $'''git config --global --edit'''
 +
 +
===Set git up to use Sublime Text===
 +
Create a batch/bash script that executes Sublime like this:
 +
$'''subl -new-windopw -wait''' ''parameters to script''
 +
 +
Make git call the script file (I assume it's not in your path):
 +
$'''git config --global core.editor''' ''script incl. path''
  
 
==Branching==
 
==Branching==

Revision as of 11:38, 9 March 2017

Configuration

Editing the global configuration:

$git config --global --edit

Set git up to use Sublime Text

Create a batch/bash script that executes Sublime like this:

$subl -new-windopw -wait parameters to script

Make git call the script file (I assume it's not in your path):

$git config --global core.editor script incl. path

Branching

Creating a branch:

$git branch branch-name

List branches:

$git branch

Switch branch:

$git checkout branch-name

Staging

$git add file-name

Committing

Commit changes:

$git commit -m "Commit message goes here."

Push committed changes:

$git push

Diffing

To see a list of changes made to the files on disk:

$git diff

To see a list of changes that have been staged:

$git diff --cached

Update changed code

To update code that has changed on the master branch, you need to 'stash' the changed code, pull the updated code and 'unstash' the stashed code. You may also have to switch branches in the process:

$git stash
$git checkout master
$git pull --rebase
$git checkout branch-you-came-from
$git stash apply