Git - tips and tricks

git
Tips & Tricks
Wallace Reis | wreis
Tuesday, October 08, 2013

Best practices?

https://trac.dev.123people.com/trac/wiki/git/workflow

[alias]
st = status
ci = commit -v
addi = add --interactive
br = checkout -b
co = checkout
pick = cherry-pick -s
praise = blame -w
up = !git stash && git pull --
rebase && git submodule update &&
git stash apply
who = shortlog -se --

Find out wtf something
was done that way?

$ git blame -s Module.pm

892dc8d8 1) package Module;
892dc8d8 2) ...
892dc8d8 3) ...

$ git show 892dc8d8

Delete remote
branches?

$ git push origin :branch_name

Revert uncommitted
changes?

$ git checkout -- <filename>
or
$ git reset --hard HEAD

Revert a commit?

$ git revert 892dc8d8

And remove
untracked files?

$ git clean -n -d # dry run
then
$ git clean -d -f # “f” may not be
required

How to mangle the
last commit done?

$ git commit --amend

How about reverting
it?

$ git revert HEAD

Which changes will a
branch bring in the next
merge?

$ git log --stat master..integration
or
$ git cherry -v master integration

How about changes
since last
deployment?

$ git log --stat release-1.53..HEAD
or
$ git cherry -v release-1.53 HEAD

How about changes
since last pull?

$ git fetch origin
$ git log --stat master..origin/
master
or
$ git cherry -v master origin/
master

Which branches are
not merged yet...

...into integration
branch?
$ git branch --no-merged integration

Would like to see a file
some revisions ago?

$ git show HEAD~3:Module.pm
or
$ git show 892dc8d8:Module.pm
or
$ git show branch_name:Module.pm

Reorder, squash,
delete, or edit
commits

$ git rebase -i HEAD~4

pick dec6340 update plaxo and live tabs
pick 5e1adaf Update plaxo and live icons
pick 7f0473a Fix flickr icon
pick 0b04eda Added Vimeo tracking.
# Rebase b7722d5..0b04eda onto b7722d5
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.

r dec6340 update plaxo and live tabs
f 5e1adaf Update plaxo and live icons
pick 0b04eda Added Vimeo tracking.
e 7f0473a Fix flickr icon
# Rebase b7722d5..0b04eda onto b7722d5
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.

Recover lost commits

$ git reflog

cb462ba HEAD@{5}: checkout: moving from 154544202d4ff890a89ca4df30286d5c7edf0b39 to
master
1545442 HEAD@{6}: commit: Add foo to shared_components
e3456b3 HEAD@{7}: checkout: moving from cb462ba81c606f3e75d797712d9b49deddb442b0 to
e3456b3d337084136b5c95ddb7268d68bf428a8e
cb462ba HEAD@{8}: checkout: moving from e3456b3d337084136b5c95ddb7268d68bf428a8e to
cb462ba81c606f3e75d797712d9b49deddb442b0
e3456b3 HEAD@{9}: checkout: moving from master to
e3456b3d337084136b5c95ddb7268d68bf428a8e

merge
or
format-patch + am

Thank you!
Discussion?

Git - tips and tricks

More Related Content

What's hot

Viewers also liked

Similar to Git - tips and tricks

Recently uploaded

Git - tips and tricks