Advanced Git

A walkthrough of some lesser-known advanced features in Git.
Presented at the KDAB company meeting in 2011.

Transcript

1. Advanced Git Mike McQuaid
2. /usr/local/bin/git-foo == git foo
3. git cherry master
4. git reflog
5. a369495 HEAD@{39}: commit (amend): Make tray icon strings more consistent. 5e7f0b0 HEAD@{40}: commit: Make tray icon strings more consistent. 8b84f7f HEAD@{41}: commit: Fix not being able to run previous task from menu. 436df83 HEAD@{42}: commit: Fix start task menu separator usage. 8e61a3f HEAD@{43}: rebase -i (continue): More consistent alternate row colors. 7c56620 HEAD@{44}: rebase -i (continue): Improve tasks eliding. 0def733 HEAD@{45}: checkout: moving from master to 0def733217f57276901da9ff578366f56d2d0f02 74fae75 HEAD@{46}: rebase -i (fixup): Improve tasks eliding. 515aa9b HEAD@{47}: rebase -i (fixup): updating HEAD
6. [alias] x = !gitx
7. [github] token = verysecurepassword123
8. [github] token = !security 2>&1 >/dev/null find- generic-password -gs github.token | grep password | cut -f2 -d\\\" #"
9. [alias] serve = !git daemon --reuseaddr --export- all --base-path=. --verbose ./.git
10. [core] excludesfile = ~/.gitignore
11. moc_*.cpp qrc_*.cpp ui_*.h *.pro.user *.o *.rej *.swp *~ .DS_Store CMakeLists.txt.user b/
12. [sendemail] identity = kdab thread = false chainreplyto = false suppresscc = all [sendemail "kdab"] smtpserver = mail.kdab.com smtpencryption = tls smtpserverport = 25 smtpuser = mike from = mike.mcquaid@kdab.com
13. Merge vs Rebase
14. 1 branch per feature git merge / git pull many branches with many merge commits 1 branch used for release
15. CMake
16. 1 branch or commit per feature git rebase / git pull --rebase 1 branch with no merge commits 1 branch used for release
17. Homebrew
18. This is the short commit message Longer commit message that spans multiple lines. - List items - Like this
19. From 2ca294d83d8f64b8ff1611efa4aa4d1baa4f291a Mon Sep 17 00:00:00 2001 From: Mike McQuaid <mike.mcquaid@kdab.com> Date: Wed, 20 Apr 2011 12:17:37 +0100 Subject: [PATCH] Add DeployQt4 module. Add a module that gives better support to BundleUtilities to handle Qt plugins and deploy Qt applications. --- Modules/DeployQt4.cmake | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) create mode 100644 Modules/DeployQt4.cmake diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake ...
20. git rebase 93b0c51
21. git merge 93b0c51
22. git clone ~/git1 ~/git2
23. git cherry-pick 93b0c51
24. Secure backup: 2ca294d83d8f64b8ff161 1efa4aa4d1baa4f291a
25. git filter-branch --tree-filter 'rm secretfile' HEAD
26. git diff 1b6d > my.patch git apply < my.patch
27. git format-patch 1b6d git am < 0001-ab.patch
28. git send-email 1b6d
29. git remote add other git://a/b.git git pull other a-branch
30. git diff origin/a other/b
31. git fetch git fetch other git fetch --all
32. export GIT_DIR=./a.git
33. GIT_WORK_TREE GIT_INDEX_FILE
34. git submodule add git://b/b.git b
35. git clone git://a/a.git cd a/b git submodule init git submodule update
36. superprojects
37. .gitattributes .git/info/attributes
38. *.pbxproj binary
39. *.doc diff=word
40. git config diff.word.textconv strings
41. *.png diff=exif
42. git config diff.exif.textconv exiftool
43. --- a/image.png +++ b/image.png @@ -1,12 +1,12 @@ -File Size : 70 kB -File Modification Date/Time : 2009:04:21 07:02:45-07:00 +File Size : 94 kB +File Modification Date/Time : 2009:04:21 07:02:43-07:00 -Image Width : 1058 -Image Height : 889 +Image Width : 1056 +Image Height : 827
44. *.txt ident echo '$Id$' > test.txt
45. applypatch-msg commit-msg post-commit post-receive post-update pre-applypatch pre-commit pre-rebase prepare-commit-msg update
46. http://zrusin.blogspot.com/2007/09/ git-cheat-sheet.html
47. Any questions?