Skip to main content

Configuring Git Aliases and Workflow

By
Let's agree, no matter what language you code in, developers life is incomplete without using git. 

These are some notes from recent video I watched about git-workflow from Gary 
Bernhart's . He shows some cool demonstration of git aliases and workflow he follows.

The git config can be directly used by replacing the .gitconfig and adding the .githelpers at [2].

Prerequisite : You must install diff-so-fancy from [1] and add it's lib folder to the system PATH


I guess I can now live without GitKraken at some point.. 

Usage (alias):
[alias]
  •     st = status
  •     ci = commit --verbose
  •     co = checkout
  •     di = diff --find-copies-harder
  •     dc = diff --find-copies-harder --cached
  •     amend = commit --amend
  •     aa = add --all
  •     ff = merge --ff-only
  •     noff = merge --no-ff
  •     fa = fetch --all
  •     pom = push origin master
  •     ds = diff --stat=160,120
  •     dh1 = diff HEAD~1

  •     # Divergence (commits we added and commits remote added)
  •     div = divergence

  •     # Goodness (summary of diff lines added/removed/total)
  •     gn = goodness
  •     gnc = goodness --cached

  •     # Fancy logging.
  •     #   h = head
  •     #   hp = head with patch
  •     #   r = recent commits, only current branch
  •     #   ra = recent commits, all reachable refs
  •     #   l = all commits, only current branch
  •     #   la = all commits, all reachable refs
  •     #   b = all branches.
  •     #   bs = all branches, sorted by last commit date
  •     head = !git r -1
  •     h = !git head
  •     hp = "!. ~/.githelpers && show_git_head"
  •     r = !GIT_NO_PAGER=1 git l -30
  •     ra = !git r --all
  •     l = "!. ~/.githelpers && pretty_git_log"
  •     la = !git l --all
  •     b = "!. ~/.githelpers && pretty_git_branch"
  •     bs = "!. ~/.githelpers && pretty_git_branch_sorted"
  •     ski = !git stash --keep-index
  •     cp = cherry-pick
  •     pf = push --force-with-lease
  •     //do a git ra first 
  •     run-command-on-git-revisions <from revision> <to revisoin> 'java test?'


Reference:

Comments

Post a Comment

Popular posts from this blog

Building Autonomous Drone with Raspberry Pi and APM 2.8

By
I am a total newbie to hardware and was pushing my limits to see how far I can reach on with hardware projects (which sparked my interest lately). I have set out on a very ambitions mission  to control a drone from raspberry pi .I began the research for this around 2 months ago and had brought a raspberry pi, drone body kit and apm flight controller. The key difference of this project from common drone projects is that I'm trying to avoid the use of and RC and instead use the raspberry pi to control it.  Hardware Ins tallation Setup: I am using APM 2.8 and Mission Planner. I am using RPi 3 to control the APM 2.8 via Telem port of APM I am planning to power the apm via the battery to ESC (Electronic Speed Controllers) Now, documenting my steps below: Day 1 Watch Tutorial To get started with APM flight controller, I watched this video tutorial [1] which gives a gentle introduction about APM board.  Setup APM board and Calibrate Sensors I downloade...
Post a Comment
Read more

Adafruit GFX - How to change line spacing in text?

By
  You may want to update the line spacing to be a little lower than default due to small screen size on IoT devices. I faced this challenge while working on a Watchy hobby project. You may have used a font generator or just using the default fonts and got a *.h file that has the details of the font. In that case just change the last integer value in the PROGMEM variable.
Post a Comment
Read more

Data Mining & Analytics with R : Running R Scripts and Data Mining Techniques - Day 2

By
Warning: These are my messy study notes, much better legible notes can be found here  http://onepager.togaware.com 1. A Tour Thru Rattle Transform Tab ( by no means near to the full power of underlying R) Data Mining Tabs - Cluster, Associate Model Log Tab  - Capture the corresponding R command Working from Left to Right on Tabs  Remember to Click Execute Button 'Save' -> Projects save the current state, all models etc. 'Open' Projects can be restored at a later time You can even load it back to R  2. First R Program Load rattle and ggplot2 library(rattle)  # Provides the weather dataset  library(rattle)  # Provides the ggplot() function ggplot -> Grammar of Graphics : Just like english grammar or grammar of a computer language. A result of Hadley's Phd . Look him up to learn more details. Then produce a plot using ggplot() # handsondatascience.com - tips on elegantly writing repeated code ds ...
Post a Comment
Read more