git tricks

git tricks Kai Höwelmeyer @kaihowl git aficionados meetup 12/13/13

git config -‐-‐global -‐-‐add
alias.co checkout git config -‐-‐global -‐-‐add alias.c commit

# On branch feature/kh-‐pipelining # Changes not staged for
commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -‐-‐ <file>..." to discard changes in # working directory) # # modified: src/lib/access/PipelineCollect.cpp # modified: src/lib/access/PipelineStream.cpp # modified: src/lib/access/system/ResponseTask.cpp # no changes added to commit (use "git add" and/or "git commit -‐a")

git config -‐-‐global -‐-‐add
alias.s “status –sb”

## feature/kh-‐pipelining M src/lib/access/PipelineCollect.cpp M src/lib/access/PipelineStream.cpp
D src/lib/access/system/ResponseTask.cpp

git config -‐-‐add color.ui 1

git add –p git reset –p
git checkout -‐p

Review before commit git diff -‐-‐staged

git commit -‐-‐amend

git stash [-‐u] git clean [-‐df]

diff -‐-‐git a/src/lib/access/SimplePipeliningTableScan.h b/src/lib/access/SimplePipeliningTableScan.h index 8b7133e..0d80830 100644
-‐-‐-‐ a/src/lib/access/SimplePipeliningTableScan.h +++ b/src/lib/access/SimplePipeliningTableScan.h @@ -‐15,7 +15,7 @@ public: void setupPlanOperation(); void executePlanOperation(); -‐ static a_planop_ptr pares(const Json::Value &data); + static a_planop_ptr parse(const Json::Value &data); void setPredicate(SimpleExpression *c); private:

git diff -‐-‐color-‐words

diff -‐-‐git a/src/lib/access/SimplePipeliningTableScan.h b/src/lib/access/SimplePipeliningTableScan.h index 4ca9b42..0d80830 100644
-‐-‐-‐ a/src/lib/access/SimplePipeliningTableScan.h +++ b/src/lib/access/SimplePipeliningTableScan.h @@ -‐15,7 +15,7 @@ public: void setupPlanOperation(); void executePlanOperation(); static a_planop_ptr paresparse(const Json::Value &data); void setPredicate(SimpleExpression *c); private:

git reset -‐-‐soft git reset [-‐-‐mixed]
git reset -‐-‐hard

Resets what? head index tree soft ✔ ✗ ✗ mixed
✔ ✔ ✗ hard ✔ ✔ ✔

git reset c1 git add git commit
c1 c2 c3 c4 HEAD feature

feature squashing c1 c2 c3 c4
c(2+3+4)’ HEAD feature

NEVER Reset, rebase, or rewrite history in any way on
any SHARED branch! "

git reflog

git log -‐-‐first-‐parent

git bisect C1 C2
C3 C4 C6 C7 C8

git bisect C1 C2
C3 C4 C6 C7 C8 good bad

git bisect C1 C2
C3 C4 C6 C7 C8 good bad good

git bisect C1 C2
C3 C4 C6 C7 C8 good bad good bad

scm_breeze oh-my-zsh vim powerline

Next time How to splice a convoluted feature branch into
atomic pull requests.

@kaihowl

git tricks

git tricks

Kai Howelmeyer

More Decks by Kai Howelmeyer

Other Decks in Programming

Featured

Transcript

git tricks Kai Höwelmeyer @kaihowl git aficionados meetup 12/13/13

git config -‐-‐global -‐-‐add

# On branch feature/kh-‐pipelining # Changes not staged for

git config -‐-‐global -‐-‐add

## feature/kh-‐pipelining M src/lib/access/PipelineCollect.cpp M src/lib/access/PipelineStream.cpp

git config -‐-‐add color.ui 1

git add –p git reset –p

Review before commit git diff -‐-‐staged

git commit -‐-‐amend

git stash [-‐u] git clean [-‐df]

diff -‐-‐git a/src/lib/access/SimplePipeliningTableScan.h b/src/lib/access/SimplePipeliningTableScan.h index 8b7133e..0d80830 100644

git diff -‐-‐color-‐words

diff -‐-‐git a/src/lib/access/SimplePipeliningTableScan.h b/src/lib/access/SimplePipeliningTableScan.h index 4ca9b42..0d80830 100644

git reset -‐-‐soft git reset [-‐-‐mixed]

Resets what? head index tree soft ✔ ✗ ✗ mixed

git reset c1 git add git commit

feature squashing c1 c2 c3 c4

NEVER Reset, rebase, or rewrite history in any way on

git reflog

git log -‐-‐first-‐parent

git bisect C1 C2

git bisect C1 C2

git bisect C1 C2

git bisect C1 C2

git bisect C1 C2

scm_breeze oh-my-zsh vim powerline

Next time How to splice a convoluted feature branch into

@kaihowl