git tricks
Post on 24-May-2015
878 Views
Preview:
TRANSCRIPT
Git TricksArthur Zapparoli
@arthurgeek
Tópicos
Ambiente
Ambiente
Configurações
Ambiente
Configurações
Comandos
Ambiente
Configurações
Comandos
Features
Ambiente
git-completion
# Copie o arquivo do source do Git
~$ cp $GIT_SOURCE/contrib/completion/git-completion.bash ~/.git-completion.sh
git-completion
# Copie o arquivo do source do Git
~$ cp $GIT_SOURCE/contrib/completion/git-completion.bash ~/.git-completion.sh
# Edite seu .bashrc
~$ vim ~/.bashrc
git-completion
# Copie o arquivo do source do Git
~$ cp $GIT_SOURCE/contrib/completion/git-completion.bash ~/.git-completion.sh
# Edite seu .bashrc
~$ vim ~/.bashrc
# Adicionando a seguinte linha
source ~/.git-completion.sh
git-completion
# Copie o arquivo do source do Git
~$ cp $GIT_SOURCE/contrib/completion/git-completion.bash ~/.git-completion.sh
# Edite seu .bashrc
~$ vim ~/.bashrc
# Adicionando a seguinte linha
source ~/.git-completion.sh
# Recarregue o ~/.bashrc
~$ source ~/.bashrc
git-completion
~$ git<tab><tab>
git-completion
~$ git<tab><tab>add citool gc notes shortlog am clean get-tar-commit-id pull show annotate clone grep push show-branch apply co gui rebase st archive commit help relink stage bisect config imap-send remote stash blame describe init repack status br diff instaweb replace submodule branch difftool log request-pull svn bundle fetch merge reset tag checkout filter-branch mergetool revert whatchanged cherry format-patch mv rm winner cherry-pick fsck name-rev send-email
git-completion
~$ git<tab><tab>add citool gc notes shortlog am clean get-tar-commit-id pull show annotate clone grep push show-branch apply co gui rebase st archive commit help relink stage bisect config imap-send remote stash blame describe init repack status br diff instaweb replace submodule branch difftool log request-pull svn bundle fetch merge reset tag checkout filter-branch mergetool revert whatchanged cherry format-patch mv rm winner cherry-pick fsck name-rev send-email
~$ git re<tab><tab>
git-completion
~$ git<tab><tab>add citool gc notes shortlog am clean get-tar-commit-id pull show annotate clone grep push show-branch apply co gui rebase st archive commit help relink stage bisect config imap-send remote stash blame describe init repack status br diff instaweb replace submodule branch difftool log request-pull svn bundle fetch merge reset tag checkout filter-branch mergetool revert whatchanged cherry format-patch mv rm winner cherry-pick fsck name-rev send-email
~$ git re<tab><tab>rebase remote replace reset relink repack request-pull revert ~$
git-completion
~$ git log --<tab><tab>
git-completion
~$ git log --<tab><tab>--abbrev --dense --inter-hunk-context= --pretty=--abbrev-commit --diff-filter= --left-right --quiet --abbrev= --dirstat --max-age= --raw --after= --dirstat-by-file --max-count= --relative-date --all --dirstat-by-file= --merges --remotes --all-match --dirstat= --min-age= --reverse --author= --dst-prefix= --name-only --root --before= --exit-code --name-status --shortstat --binary --ext-diff --no-color --simplify-by-decoration --branches --find-copies-harder --no-ext-diff --simplify-merges --check --first-parent --no-merges --since=--cherry-pick --follow --no-prefix --sparse --children --format= --no-renames --src-prefix=--color --full-diff --not --stat --color-words --full-history --numstat --summary --committer= --full-index --oneline --tags --cumulative --graph --parents --text --date-order --grep= --patch-with-stat --topo-order --date= --ignore-all-space --patience --until=--More--
git-completion
~$ git config core.<tab><tab>
git-completion
~$ git config core.<tab><tab>core.autocrlf core.ignoreCygwinFSTricks core.repositoryFormatVersion core.bare core.ignoreStat core.safecrlf core.compression core.logAllRefUpdates core.sharedRepository core.createObject core.loosecompression core.symlinks core.deltaBaseCacheLimit core.packedGitLimit core.trustctime core.editor core.packedGitWindowSize core.warnAmbiguousRefs core.excludesfile core.pager core.whitespace core.fileMode core.preferSymlinkRefs core.worktree core.fsyncobjectfiles core.preloadindex core.gitProxy core.quotepath ~$
git-completion
prompt
# Edite seu .bashrc
~$ vim ~/.bashrc
# Adicionando a seguinte linha
export PS1='\w$(__git_ps1 "(%s)")'
# Recarregue o ~/.bashrc
~$ source ~/.bashrc
prompt
prompt# Em um repositório git
~$
# Em um repositório git
~$ cd git-tricks
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-name
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$ touch NEWFILE
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$ touch NEWFILE~/git-tricks(branch-name $%)$
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$ touch NEWFILE~/git-tricks(branch-name $%)$ export GIT_PS1_SHOWUPSTREAM=auto
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$ touch NEWFILE~/git-tricks(branch-name $%)$ export GIT_PS1_SHOWUPSTREAM=auto~/git-tricks(branch-name $%=)$ # branch local e origin estão em sincronia
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$ touch NEWFILE~/git-tricks(branch-name $%)$ export GIT_PS1_SHOWUPSTREAM=auto~/git-tricks(branch-name $%=)$ # branch local e origin estão em sincronia~/git-tricks(branch-name $%>)$ # branch local está "a frente" do origin
prompt
# Em um repositório git
~$ cd git-tricks~/git-tricks(master)$ git checkout branch-nameSwitched to branch 'branch-name'~/git-tricks(branch-name)$ export GIT_PS1_SHOWDIRTYSTATE=true~/git-tricks(branch-name)$ lsREADME~/git-tricks(branch-name)$ echo "Olá" >> README~/git-tricks(branch-name *)$ git add README~/git-tricks(branch-name +)$ export GIT_PS1_SHOWSTASHSTATE=true~/git-tricks(branch-name +)$ git stash~/git-tricks(branch-name $)$ export GIT_PS1_SHOWUNTRACKEDFILES=true~/git-tricks(branch-name $)$ touch NEWFILE~/git-tricks(branch-name $%)$ export GIT_PS1_SHOWUPSTREAM=auto~/git-tricks(branch-name $%=)$ # branch local e origin estão em sincronia~/git-tricks(branch-name $%>)$ # branch local está "a frente" do origin ~/git-tricks(branch-name $%<)$ # branch local está "atrás" do origin
prompt
Configurações
core.excludesfile
.gitignore global
core.excludesfile
.gitignore global
~$ git config --global core.excludesfile ~/.gitignore~$
core.excludesfile
.gitignore global
~$ git config --global core.excludesfile ~/.gitignore~$ cat ~/.gitignore
.DS_Store
.rvmrcetc...
core.excludesfile
help.format
visualizar ajuda em HTML
help.format
visualizar ajuda em HTML
~$ git config --global help.format web
help.format
visualizar ajuda em HTML
~$ git config --global help.format web~$ git help commit
help.format
visualizar ajuda em HTML
~$ git config --global help.format web~$ git help commit
help.format
visualizar ajuda em HTML
~$ git config --global web.browser ff
help.format
visualizar ajuda em HTML
~$ git config --global web.browser ff~$ git config --global browser.ff.cmd "open -a Firefox.app"
help.format
visualizar ajuda em HTML
~$ git config --global web.browser ff~$ git config --global browser.ff.cmd "open -a Firefox.app"~$ git help commit
help.format
visualizar ajuda em HTML
~$ git config --global web.browser ff~$ git config --global browser.ff.cmd "open -a Firefox.app"~$ git help commit
help.format
push.default
enviar apenas o branch atual
push.default
enviar apenas o branch atual
~$ git config --global push.default current
push.default
commit.template
template para a mensagem de commit
commit.template
template para a mensagem de commit
~$ cat ~/.commit-message.txtAssunto
O que eu fiz
[ticket: X]
commit.template
template para a mensagem de commit
~$ cat ~/.commit-message.txtAssunto
O que eu fiz
[ticket: X]~$ git config --global commit.template ~/.commit-message.txt
commit.template
template para a mensagem de commit
~$ cat ~/.commit-message.txtAssunto
O que eu fiz
[ticket: X]~$ git config --global commit.template ~/.commit-message.txt~$ git commitAssunto
O que eu fiz
[ticket: X]# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# On branch master# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)## modified: lib/test.rb#~
commit.template
help.autocorrect
roda o comando correto, mesmo se você digitou errado
help.autocorrect
roda o comando correto, mesmo se você digitou errado
~$ git statgit: 'stat' is not a git command. See 'git --help'.
Did you mean this? status~$
help.autocorrect
roda o comando correto, mesmo se você digitou errado
~$ git statgit: 'stat' is not a git command. See 'git --help'.
Did you mean this? status~$ git config --global help.autocorrect 1~$
help.autocorrect
roda o comando correto, mesmo se você digitou errado
~$ git statgit: 'stat' is not a git command. See 'git --help'.
Did you mean this? status~$ git config --global help.autocorrect 1~$ git statWARNING: You called a Git command named 'stat', which does not exist.Continuing under the assumption that you meant 'status'in 0.1 seconds automatically...# On branch masternothing to commit (working directory clean)~$
help.autocorrect
branch.master.rebase
`git pull` no master sempre com rebase
branch.master.rebase
`git pull` no master sempre com rebase
~$ git config branch.master.rebase true
# Chega de digitar `git pull --rebase`!
branch.master.rebase
branch.autosetuprebase
`git pull` sempre com rebase em todos os “tracking branches”
branch.autosetuprebase
`git pull` sempre com rebase em todos os “tracking branches”
~$ git config --global branch.autosetuprebase always
# Chega de digitar `git pull --rebase`!
branch.autosetuprebase
Comandos
git commit --verbose
Exibe um diff abaixo da mensagem de commit
git commit --verbose
Exibe um diff abaixo da mensagem de commit
~/git-tricks(master)$ echo "Mundo" >> README~/git-tricks(master *)$
git commit --verbose
Exibe um diff abaixo da mensagem de commit
~/git-tricks(master)$ echo "Mundo" >> README~/git-tricks(master *)$ git commit -a -v # Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.[...]#diff --git a/README b/READMEindex 1ca34a8..feae20b 100644--- a/README+++ b/README@@ -1 +1,2 @@ Olá+Mundo
git commit --verbose
git diff --word-diff
diff com destaque nas palavras
git diff --word-diff
diff com destaque nas palavras
git diff --word-diff
~/git-tricks(master)$ git diffdiff --git a/README b/READMEindex 84dd63e..0cc3cbe 100644--- a/README+++ b/README@@ -1 +1 @@-Olá Mundo+Oi Mundo~/git-tricks(master)$
diff com destaque nas palavras
git diff --word-diff
~/git-tricks(master)$ git diffdiff --git a/README b/READMEindex 84dd63e..0cc3cbe 100644--- a/README+++ b/README@@ -1 +1 @@-Olá Mundo+Oi Mundo~/git-tricks(master)$ git diff --word-diffdiff --git a/README b/READMEindex 84dd63e..0cc3cbe 100644--- a/README+++ b/README@@ -1 +1 @@[-Olá-]{+Oi+} Mundo
git log --decorate
Exibe branches e tags no git log
git log --decorate
Exibe branches e tags no git log
~/git-tricks(fixes)$ git log --oneline --decoratefceaeb5 (HEAD, fixes) typoc1bcf8a (tag: v0.2.0) Fix80e9826 (origin/master, origin/HEAD, master) Second commit3247745 (tag: v0.1.0) Initial commit~/git-tricks(fixes)$
git log --decorate
git status -s -b
mensagem de status curta
git status -s -b
mensagem de status curta
~/git-tricks(master)$ git status -s -b## master...origin/master [ahead 2, behind 3] M READMEA TODO?? LICENSE?? AUTHORS~/git-tricks(master)$
git status -s -b
git push -u
envia um branch e configura o tracking
git push -u
envia um branch e configura o tracking
~/git-tricks(fixes)$ git push -u origin fixes * [new branch] fixes -> fixesBranch fixes set up to track remote branch fixes from origin.~/git-tricks(fixes)$
git push -u
git checkout -t
cria, faz checkout e tracking de branches remotos
git checkout -t
cria, faz checkout e tracking de branches remotos
~/git-tricks(master)$ git checkout -t origin/fixesBranch fixes set up to track remote branch fixes from origin.Switched to a new branch 'fixes'~/git-tricks(fixes)$
git checkout -t
git branch
visualizando informações dos branches
git branch
visualizando informações dos branches
~/git-tricks(master)$ git branchfixesi18n* masterrelease~/git-tricks(master)$
git branch
visualizando informações dos branches
~/git-tricks(master)$ git branchfixesi18n* masterrelease~/git-tricks(master)$ git branch --mergedfixes* master~/git-tricks(master)$
git branch
visualizando informações dos branches
~/git-tricks(master)$ git branchfixesi18n* masterrelease~/git-tricks(master)$ git branch --mergedfixes* master~/git-tricks(master)$ git branch --no-mergedi18nrelease~/git-tricks(master)$
git branch
visualizando informações dos branches
~/git-tricks(master)$ git branchfixesi18n* masterrelease~/git-tricks(master)$ git branch --mergedfixes* master~/git-tricks(master)$ git branch --no-mergedi18nrelease~/git-tricks(master)$ git branch --contains c1bcf8afixes* master~/git-tricks(master)$
git branch
git blame -L
blame com range de linhas
git blame -L
blame com range de linhas
~/rails(master)$ git blame version.rbb1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 1) module Railsb1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 2) module VERSION #:nodoc:b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 3) MAJOR = 321b1f297 (David Heinemeier Hansson 2010-08-23 21:44:57 -0500 4) MINOR = 1b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 5) TINY = 0ccd2f3ed (Carl Lerche 2010-11-16 15:11:46 -0800 6) PRE = "beta"b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 7) ccd2f3ed (Carl Lerche 2010-11-16 15:11:46 -0800 8) STRING = b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 9) endb1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 10) end~/rails(master)$
git blame -L
blame com range de linhas
~/rails(master)$ git blame version.rbb1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 1) module Railsb1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 2) module VERSION #:nodoc:b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 3) MAJOR = 321b1f297 (David Heinemeier Hansson 2010-08-23 21:44:57 -0500 4) MINOR = 1b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 5) TINY = 0ccd2f3ed (Carl Lerche 2010-11-16 15:11:46 -0800 6) PRE = "beta"b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 7) ccd2f3ed (Carl Lerche 2010-11-16 15:11:46 -0800 8) STRING = b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 9) endb1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 10) end~/rails(master)$ git blame -L 4,7 version.rb21b1f297 (David Heinemeier Hansson 2010-08-23 21:44:57 -0500 4) MINOR = 1b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 5) TINY = 0ccd2f3ed (Carl Lerche 2010-11-16 15:11:46 -0800 6) PRE = "beta"b1769fe0 (Bryan Helmkamp 2010-03-01 23:02:55 -0500 7)~/rails(master)$
git blame -L
git blame -C
blame com informações de onde o conteúdo veio
git blame -C
blame com informações de onde o conteúdo veio
~/rails(master)$ git blame -C -L 2,6 README.rdocb70062f1 README (José Valim 2010-07-21 12:37:05 +0200 2) 3cd9627b README.rdoc (Xavier Noria 2010-08-21 02:23:04 +0200 3) dba196cb railties/README (Pratik Naik 2010-01-17 03:26:20 +0530 4)3e732780 railties/README (David Heinemeier Hansson 2008-03-29 18:45:39 +0000 5) 1535b02a railties/README (Matt Di Pasquale 2010-03-24 02:17:09 -0400 6)~/rails(master)$
git blame -C
Features
stash
guarda as alterações em um “commit” temporário
stash
guarda as alterações em um “commit” temporário
~/git-tricks(master)$ echo "Hello World" >> README~/git-tricks(master)$ git status -s M README~/git-tricks(master)$
stash
guarda as alterações em um “commit” temporário
~/git-tricks(master)$ echo "Hello World" >> README~/git-tricks(master)$ git status -s M README~/git-tricks(master)$ git stashSaved working directory and index state WIP on master: 51e034d typoHEAD is now at 51e034d typo~/git-tricks(master)$
stash
guarda as alterações em um “commit” temporário
~/git-tricks(master)$ echo "Hello World" >> README~/git-tricks(master)$ git status -s M README~/git-tricks(master)$ git stashSaved working directory and index state WIP on master: 51e034d typoHEAD is now at 51e034d typo~/git-tricks(master)$ git status -s~/git-tricks(master)$ git stash liststash@{0}: WIP on master: 51e034d typo~/git-tricks(master)$
stash
guarda as alterações em um “commit” temporário
~/git-tricks(master)$ echo "Hello World" >> README~/git-tricks(master)$ git status -s M README~/git-tricks(master)$ git stashSaved working directory and index state WIP on master: 51e034d typoHEAD is now at 51e034d typo~/git-tricks(master)$ git status -s~/git-tricks(master)$ git stash liststash@{0}: WIP on master: 51e034d typo~/git-tricks(master)$ git show stash@{0}commit 2f7289f68669d3b5e70ecff1ba7e3ac4742135e9Merge: 51e034d 36167acAuthor: Arthur Zapparoli <arthurzap@gmail.com>Date: Wed Feb 20 20:23:47 2011 -0300
WIP on master: 51e034d typo
diff --cc READMEindex 1a52f2e,1a52f2e..003468d--- a/README+++ b/README@@@ -1,2 -1,2 +1,3 @@@ Oi Mundo .++Hello World
stash
~/git-tricks(master)$ git stash pop~/git-tricks(master)$ git status -s M README~/git-tricks(master)$ git status list~/git-tricks(master)$
stashguarda as alterações em um “commit” temporário
~/git-tricks(master)$ git stash pop~/git-tricks(master)$ git status -s M README~/git-tricks(master)$ git status list~/git-tricks(master)$ git stash save "mensagem"Saved working directory and index state On master: mensagemHEAD is now at 51e034d typo~/git-tricks(master)$ git stash liststash@{0}: On master: mensagem~/git-tricks(master)$
stashguarda as alterações em um “commit” temporário
staging area
tenho 2 arquivos, quero adicionar só 1
staging area
tenho 2 arquivos, quero adicionar só 1
~/git-tricks(master)$ git status# On branch master# Changed but not updated:## modified: AUTHORS# modified: README#no changes added to commit (use "git add" and/or "git commit -a")~/git-tricks(master)$
staging area
tenho 2 arquivos, quero adicionar só 1
~/git-tricks(master)$ git status# On branch master# Changed but not updated:## modified: AUTHORS# modified: README#no changes added to commit (use "git add" and/or "git commit -a")~/git-tricks(master)$ git add README~/git-tricks(master)$ git status# On branch master# Changes to be committed:## modified: README## Changed but not updated:## modified: AUTHORS#~/git-tricks(master)$
staging area
tenho 2 arquivos, quero adicionar só 1
~/git-tricks(master)$ git commit -m "English!"[master 76b2c02] English 1 files changed, 1 insertions(+), 0 deletions(-)~/git-tricks(master)$
staging area
tenho 2 arquivos, quero adicionar só 1
~/git-tricks(master)$ git commit -m "English!"[master 76b2c02] English 1 files changed, 1 insertions(+), 0 deletions(-)~/git-tricks(master)$ git status# On branch master# Changed but not updated:## modified: AUTHORS#no changes added to commit (use "git add" and/or "git commit -a")~/git-tricks(master)$
staging area
quando eu quero adicionar apenas uma parte de um arquivo
staging area
quando eu quero adicionar apenas uma parte de um arquivo
~/git-tricks(master)$ git status -s M AUTHORS~/git-tricks(master)$
staging area
quando eu quero adicionar apenas uma parte de um arquivo
~/git-tricks(master)$ git status -s M AUTHORS~/git-tricks(master)$ git add -i*** Commands *** 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elpWhat now>
staging area
quando eu quero adicionar apenas uma parte de um arquivo
~/git-tricks(master)$ git status -s M AUTHORS~/git-tricks(master)$ git add -i*** Commands *** 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elpWhat now> 5 1: unchanged +2/-0 [A]UTHORSPatch update>> 1* 1: unchanged +2/-0 [A]UTHORSPatch update>>diff --git a/AUTHORS b/AUTHORSindex e69de29..5db9767 100644--- a/AUTHORS+++ b/AUTHORS@@ -0,0 +1,2 @@+Arthur+GuilhermeStage this hunk [y,n,q,a,d,/,e,?]?
staging area
quando eu quero adicionar apenas uma parte de um arquivo
Stage this hunk [y,n,q,a,d,/,e,?]? y - stage this hunkn - do not stage this hunkq - quit; do not stage this hunk nor any of the remaining onesa - stage this hunk and all later hunks in the filed - do not stage this hunk nor any of the later hunks in the fileg - select a hunk to go to/ - search for a hunk matching the given regexj - leave this hunk undecided, see next undecided hunkJ - leave this hunk undecided, see next hunkk - leave this hunk undecided, see previous undecided hunkK - leave this hunk undecided, see previous hunks - split the current hunk into smaller hunkse - manually edit the current hunk? - print help@@ -0,0 +1,2 @@+Arthur+GuilhermeStage this hunk [y,n,q,a,d,/,e,?]?
staging area
quando eu quero adicionar apenas uma parte de um arquivo
Stage this hunk [y,n,q,a,d,/,e,?]? e# Manual hunk edit mode -- see bottom for a quick guide@@ -0,0 +1,2 @@+Arthur+Guilherme# ---# To remove '-' lines, make them ' ' lines (context).# To remove '+' lines, delete them.# Lines starting with # will be removed.## If the patch applies cleanly, the edited hunk will immediately be# marked for staging. If it does not apply cleanly, you will be given# an opportunity to edit again. If all lines of the hunk are removed,# then the edit is aborted and the hunk is left unchanged.
staging area
quando eu quero adicionar apenas uma parte de um arquivo
Stage this hunk [y,n,q,a,d,/,e,?]? e# Manual hunk edit mode -- see bottom for a quick guide@@ -0,0 +1,2 @@+Arthur+Guilherme# ---# To remove '-' lines, make them ' ' lines (context).# To remove '+' lines, delete them.# Lines starting with # will be removed.## If the patch applies cleanly, the edited hunk will immediately be# marked for staging. If it does not apply cleanly, you will be given# an opportunity to edit again. If all lines of the hunk are removed,# then the edit is aborted and the hunk is left unchanged.*** Commands *** 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elpWhat now> 7Bye.~/git-tricks(master)$
staging area
quando eu quero adicionar apenas uma parte de um arquivo
~/git-tricks(master)$ git status# On branch master# Changes to be committed:## modified: AUTHORS## Changed but not updated:## modified: AUTHORS#~/git-tricks(master)$
staging area
rebase
reaplica as mudanças de um branch em cima de outro
rebase
reaplica as mudanças de um branch em cima de outro
~/git-tricks(master)$ git branch authors* master~/git-tricks(master)$ git branch --no-merged authors~/git-tricks(master)$ git log --oneline --graph* f121878 Fix* 76b2c02 English[...]~/git-tricks(master)$
rebase
reaplica as mudanças de um branch em cima de outro
~/git-tricks(master)$ git branch authors* master~/git-tricks(master)$ git branch --no-merged authors~/git-tricks(master)$ git log --oneline --graph* f121878 Fix* 76b2c02 English[...]~/git-tricks(master)$ git merge authors~/git-tricks(master)$ git log --oneline --graph --decorate* c81cff6 (HEAD, master) Merge branch 'authors'|\ | * 1e2f8a4 (authors) New Authors* | f121878 Fix|/ * 76b2c02 English
rebase
reaplica as mudanças de um branch em cima de outro
~/git-tricks(master)$ git branch authors* master~/git-tricks(master)$ git branch --no-merged authors~/git-tricks(master)$ git log --oneline --graph* f121878 Fix* 76b2c02 English[...]~/git-tricks(master)$ git rebase authorsFirst, rewinding head to replay your work on top of it...Applying: Fix~/git-tricks(master)$ git log --oneline --graph --decorate* b28e647 (HEAD, master) Fix* 1e2f8a4 (authors) New Authors* 76b2c02 English
rebase
reescrevendo a história
editando o último commit
reescrevendo a história
editando o último commit
reescrevendo a história
amend
editando o último commit
~/git-tricks(master)$ git log --onelinefceaeb5 typoc1bcf8a Fix80e9826 Second commit3247745 Initial commit~/git-tricks(master)$
reescrevendo a história
amend
editando o último commit
~/git-tricks(master)$ git log --onelinefceaeb5 typoc1bcf8a Fix80e9826 Second commit3247745 Initial commit~/git-tricks(master)$ echo "." >> README ~/git-tricks(master)$ git commit -a --amend[master 5dc6308] typo 1 files changed, 2 insertions(+), 1 deletions(-)~/git-tricks(master)$
reescrevendo a história
amend
editando o último commit
~/git-tricks(master)$ git log --onelinefceaeb5 typoc1bcf8a Fix80e9826 Second commit3247745 Initial commit~/git-tricks(master)$ echo "." >> README ~/git-tricks(master)$ git commit -a --amend[master 5dc6308] typo 1 files changed, 2 insertions(+), 1 deletions(-)~/git-tricks(master)$ git log --oneline5dc6308 typoc1bcf8a Fix80e9826 Second commit3247745 Initial commit~/git-tricks(master)$
reescrevendo a história
amend
editando o último commit
~/git-tricks(master)$ git log --onelinefceaeb5 typoc1bcf8a Fix80e9826 Second commit3247745 Initial commit~/git-tricks(master)$ echo "." >> README ~/git-tricks(master)$ git commit -a --amend[master 5dc6308] typo 1 files changed, 2 insertions(+), 1 deletions(-)~/git-tricks(master)$ git log --oneline5dc6308 typoc1bcf8a Fix80e9826 Second commit3247745 Initial commit~/git-tricks(master)$
reescrevendo a história
amend
reescrevendo a história
editando vários commits de uma só vez
reescrevendo a história
editando vários commits de uma só vez
reescrevendo a história
rebase -i
editando vários commits de uma só vez
~/git-tricks(master)$ git log --onelineb28e647 Fix1e2f8a4 New Authors76b2c02 English~/git-tricks(master)$
reescrevendo a história
rebase -i
editando vários commits de uma só vez
~/git-tricks(master)$ git log --onelineb28e647 Fix1e2f8a4 New Authors76b2c02 English~/git-tricks(master)$ git rebase -i HEAD~3pick 76b2c02 Englishpick 1e2f8a4 New Authorspick b28e647 Fix
# Rebase 76b2c02..b28e647 onto 76b2c02## 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## If you remove a line here THAT COMMIT WILL BE LOST.# However, if you remove everything, the rebase will be aborted.#
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelineb28e647 Fix1e2f8a4 New Authors76b2c02 English~/git-tricks(master)$ git rebase -i HEAD~3pick 76b2c02 Englishedit 1e2f8a4 New Authorspick b28e647 Fix
# Rebase 76b2c02..b28e647 onto 76b2c02## 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## If you remove a line here THAT COMMIT WILL BE LOST.# However, if you remove everything, the rebase will be aborted.#
reescrevendo a história
rebase -i
editando vários commits de uma só vez
Stopped at 1e2f8a4... New AuthorsYou can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
~/git-tricks(master|REBASE-i)$
reescrevendo a história
rebase -i
editando vários commits de uma só vez
Stopped at 1e2f8a4... New AuthorsYou can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
~/git-tricks(master|REBASE-i)$ git commit --amend[detached HEAD 0c434b4] New Authors: Arthur and Guilherme 1 files changed, 2 insertions(+), 0 deletions(-)~/git-tricks(master|REBASE-i)$ git rebase --continueSuccessfully rebased and updated refs/heads/master.~/git-tricks(master)$ git log --onelineedac081 Fix0c434b4 New Authors: Arthur and Guilherme76b2c02 English
reescrevendo a história
rebase -i
editando vários commits de uma só vez
Stopped at 1e2f8a4... New AuthorsYou can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
~/git-tricks(master|REBASE-i)$ git commit --amend[detached HEAD 0c434b4] New Authors: Arthur and Guilherme 1 files changed, 2 insertions(+), 0 deletions(-)~/git-tricks(master|REBASE-i)$ git rebase --continueSuccessfully rebased and updated refs/heads/master.~/git-tricks(master)$ git log --onelineedac081 Fix0c434b4 New Authors: Arthur and Guilherme76b2c02 English
reescrevendo a história
rebase -i
Antes:b28e647 Fix1e2f8a4 New Authors76b2c02 English
editando vários commits de uma só vez
reordenando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelineedac081 Fix0c434b4 New Authors: Arthur and Guilherme76b2c02 English3933fbc Adding AUTHORS~/git-tricks(master)$ git rebase -i HEAD~4pick 3933fbc Adding AUTHORSpick 76b2c02 Englishpick 0c434b4 New Authors: Arthur and Guilhermepick edac081 Fix
reordenando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelineedac081 Fix0c434b4 New Authors: Arthur and Guilherme76b2c02 English3933fbc Adding AUTHORS~/git-tricks(master)$ git rebase -i HEAD~4pick 76b2c02 Englishpick edac081 Fixpick 3933fbc Adding AUTHORSpick 0c434b4 New Authors: Arthur and Guilherme
reordenando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelineedac081 Fix0c434b4 New Authors: Arthur and Guilherme76b2c02 English3933fbc Adding AUTHORS~/git-tricks(master)$ git rebase -i HEAD~4pick 76b2c02 Englishpick edac081 Fixpick 3933fbc Adding AUTHORSpick 0c434b4 New Authors: Arthur and Guilherme
~/git-tricks(master)$ git log --onelinec3187e3 New Authors: Arthur and Guilherme40a5b76 Adding AUTHORS76bc060 Fix36553c5 English~/git-tricks(master)$
deletando commits
reescrevendo a história
rebase -i
deletando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelinec3187e3 New Authors: Arthur and Guilherme40a5b76 Adding AUTHORS76bc060 Fix36553c5 English~/git-tricks(master)$ git rebase -i HEAD~4pick 36553c5 Englishpick edac081 Fixpick 3933fbc Adding AUTHORSpick 0c434b4 New Authors: Arthur and Guilherme
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelinec3187e3 New Authors: Arthur and Guilherme40a5b76 Adding AUTHORS76bc060 Fix36553c5 English~/git-tricks(master)$ git rebase -i HEAD~4pick 36553c5 Englishpick 3933fbc Adding AUTHORSpick 0c434b4 New Authors: Arthur and Guilherme
deletando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelinec3187e3 New Authors: Arthur and Guilherme40a5b76 Adding AUTHORS76bc060 Fix36553c5 English~/git-tricks(master)$ git rebase -i HEAD~4pick 36553c5 Englishpick 3933fbc Adding AUTHORSpick 0c434b4 New Authors: Arthur and Guilherme
~/git-tricks(master)$ git log --onelinef648606 New Authors: Arthur and Guilherme373183d Adding AUTHORS36553c5 English~/git-tricks(master)$
deletando commits
reescrevendo a história
rebase -i
juntando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelinef648606 New Authors: Arthur and Guilherme373183d Adding AUTHORS36553c5 English~/git-tricks(master)$ git rebase -i HEAD~3pick 36553c5 Englishpick 373183d Adding AUTHORSpick f648606 New Authors: Arthur and Guilherme
juntando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelinef648606 New Authors: Arthur and Guilherme373183d Adding AUTHORS36553c5 English~/git-tricks(master)$ git rebase -i HEAD~3pick 36553c5 Englishpick 373183d Adding AUTHORSsquash f648606 New Authors: Arthur and Guilherme
juntando commits
reescrevendo a história
rebase -i
~/git-tricks(master)$ git log --onelinef648606 New Authors: Arthur and Guilherme373183d Adding AUTHORS36553c5 English~/git-tricks(master)$ git rebase -i HEAD~3pick 36553c5 Englishpick 373183d Adding AUTHORSsquash f648606 New Authors: Arthur and Guilherme
~/git-tricks(master)$ # This is a combination of 2 commits. # The first commit's message is:
Adding AUTHORS
# This is the 2nd commit message:
New Authors: Arthur and Guilherme
# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# Not currently on any branch.# Changes to be committed:
juntando commits
reescrevendo a história
rebase -i
[detached HEAD 8f851b8] Adding AUTHORS 1 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 AUTHORSSuccessfully rebased and updated refs/heads/master.~/git-tricks(master)$ git log --oneline8f851b8 Adding AUTHORS36553c5 English~/git-tricks(master)$
juntando commits
ajuda a encontrar onde foram introduzidos bugs
bisect
escolha quais commits fazer merge
cherry-pick
cria patches à partir de commits
format-patch
recupera dados perdidos
reflog
define como trabalhar com arquivos binários
attributes
lembra resoluções de conflitos e as aplica automaticamente na próxima vez
rerere
remove objetos obsoletos
garbage collector
adiciona notas aos seus commits
notes
uma maneira melhor de “exportar” repositórios
bundlesbundles
e muito mais...
egenial.com.br/git
Git: do zero a samurai
Dúvidas?
Obrigado!
top related