How to become a Git power user

•

1 like•663 views

This slide set is for the webinar we hosted about becoming a Git power user. It's a slide set for webinar series talking about different topics related to Git power usage. Covered topics are: - Git Aliases - Rewriting history - Fast context switching - Different merging strategies

Software

GIT POWER USER
Ilmari Kontulainen
@kontulai
@deveoteam
#gitpoweruser
Viimeksi muokattu: 9. Tammikuuta 2015Luottamuksellinen

• Git Aliases
• Rewriting history
• Fast context switching
• Different merging strategies
Topics

• git conﬁg --global alias.co checkout
• git conﬁg --global alias.br branch
• git conﬁg --global alias.ci commit
• git conﬁg --global alias.st status
• git conﬁg --global alias.dc diff --cached
• git conﬁg --global alias.hist ‘log --graph --oneline --decorate --all’
• git conﬁg --global alias.unstage 'reset HEAD --'
• git conﬁg --global alias.last 'log -1 HEAD'
Git Aliases

• git conﬁg --global alias.helloworld ‘!echo “Hello world”’
• git conﬁg --global alias.hello ‘!f() { echo Hello $1; }; f’
• git conﬁg --global alias.co-recurse '!sh -c “git checkout $1 && git
submodule update --recursive" -'
Execute any shell command with aliases

• git commit --amend
• git rebase
• git rebase -i
Rewriting history

• Modify last commit
• Or simply edit the commit message
• Changes the commit commit
• Deveo prevents pushing changed history to master branch by default
git commit --amend

• Base the work on my branch to some other branch
• creates new commits
git rebase
https://git-scm.com/book/en/v2/book/03-git-branching/images/basic-rebase-1.png

git rebase -i
• Clean up the history of your feature branch
• pick
• squash, ﬁxup
• drop
• edit or reword

• git stash
• git stash --keep-index
• git stash --include-untracked
• git stash --all
• git stash --patch
Fast context switching

• regular merge
• -- no-ff / --ff-only (Deveo uses --no-ff)
• --squash
• merging multiple branches into one
Different merging strategies

https://git-scm.com/book
Next webinar 1st of Dec 2016

What's hot

沒有 GUI 的 GitChia Wei Tsai

Git advancedPeter Vandenabeele

Git basics : a beginner's guideDigital Product School

Git 101 WorkshopJoy Seng

Git Magic: Versioning Files like a Bosstmacwilliam

Git operation 101Kyohei Moriyama

Git and git workflow best practiceMajid Hosseini

Git githubAnurag Deb

Juliette Reinders Folmer - Promote your open source project with GitHub Pages...Codemotion

News from EGit - Talk EclipseCon Europe 2014 - Ludwigsburgmsohn

Using Git on the Command LineBrian Richards

Introduction to GitRick Umali

Git - Get Ready To Use ItDaniel Kummer

Undoing Things in Gitgittower

Introduction to gitAhmed Fathallah

Git TricksIvelina Dimova

Git 基础pan weizeng

Open Source Collaboration With Git And Git HubNick Quaranto

Git-r-DoneCesar Martinez

Bedjango talk about Git & GitHubBeDjango

What's hot (20)

沒有 GUI 的 Git

Git advanced

Git basics : a beginner's guide

Git 101 Workshop

Git Magic: Versioning Files like a Boss

Git operation 101

Git and git workflow best practice

Git github

Juliette Reinders Folmer - Promote your open source project with GitHub Pages...

News from EGit - Talk EclipseCon Europe 2014 - Ludwigsburg

Using Git on the Command Line

Introduction to Git

Git - Get Ready To Use It

Undoing Things in Git

Introduction to git

Git Tricks

Git 基础

Open Source Collaboration With Git And Git Hub

Git-r-Done

Bedjango talk about Git & GitHub

Similar to How to become a Git power user

Git a stupid change tracker and persistent map.Pitambar Jha

Git in 5 MinutesRobert Dumas

Advanted git Sahil Gupta

Git - Some tips to do it betterJonas De Smet

Basic gitCasper Chen

Git session Dropsolid.comdropsolid

Git basics 2Peter Carenza

The Basics of Open Source Collaboration With Git and GitHubBigBlueHat

Git workshop - University of Moratuwa, Department of Computer Science and Eng...WSO2

git-and-bitbucketazwildcat

maksym vlasov - culture of git as roots of your ciDariia Seimova

Git One Day Training Notesglen_a_smith

Git: Why And How tolanhuonga3

Git study notesAngus Li

Advanced Git TutorialSage Sharp

Learn Git - For Beginners and Intermediate levelsGorav Singal

Git Tech TalkChris Johnson

Git Tutorial IJim Yeh

Git isthenewsexyAilsa126

Github basicsRadoslav Georgiev

Similar to How to become a Git power user (20)

Git a stupid change tracker and persistent map.

Git in 5 Minutes

Advanted git

Git - Some tips to do it better

Basic git

Git session Dropsolid.com

Git basics 2

The Basics of Open Source Collaboration With Git and GitHub

Git workshop - University of Moratuwa, Department of Computer Science and Eng...

git-and-bitbucket

maksym vlasov - culture of git as roots of your ci

Git One Day Training Notes

Git: Why And How to

Git study notes

Advanced Git Tutorial

Learn Git - For Beginners and Intermediate levels

Git Tech Talk

Git Tutorial I

Git isthenewsexy

Github basics

Recently uploaded

CHEAP Call Girls in Pushp Vihar (-DELHI )🔝 9953056974🔝(=)/CALL GIRLS SERVICE9953056974 Low Rate Call Girls In Saket, Delhi NCR

why an Opensea Clone Script might be your perfect match.pdfjoe51371421

Short Story: Unveiling the Reasoning Abilities of Large Language Models by Ke...kellynguyen01

Steps To Getting Up And Running Quickly With MyTimeClock Employee Scheduling ...MyIntelliSource, Inc.

Exploring iOS App Development: Simplifying the ProcessEvangelist Apps https://twitter.com/EvangelistSW/

Tech Tuesday-Harness the Power of Effective Resource Planning with OnePlan’s ...OnePlan Solutions

Reassessing the Bedrock of Clinical Function Models: An Examination of Large ...harshavardhanraghave

Advancing Engineering with AI through the Next Generation of Strategic Projec...OnePlan Solutions

Unveiling the Tech Salsa of LAMs with Janus in Real-Time ApplicationsAlberto González Trastoy

The Real-World Challenges of Medical Device Cybersecurity- Mitigating Vulnera...ICS

5 Signs You Need a Fashion PLM Software.pdfWave PLM

Test Automation Strategy for Frontend and BackendArshad QA

A Secure and Reliable Document Management System is Essential.docxComplianceQuest1

Optimizing AI for immediate response in Smart CCTVshikhaohhpro

How To Use Server-Side Rendering with Nuxt.jsAndolasoft Inc

The Ultimate Test Automation Guide_ Best Practices and Tips.pdfkalichargn70th171

Learn the Fundamentals of XCUITest Framework_ A Beginner's Guide.pdfkalichargn70th171

How To Troubleshoot Collaboration Apps for the Modern Connected WorkerThousandEyes

Hand gesture recognition PROJECT PPT.pptxbodapatigopi8531

Microsoft AI Transformation Partner Playbook.pdfWilly Marroquin (WillyDevNET)

Recently uploaded (20)

CHEAP Call Girls in Pushp Vihar (-DELHI )🔝 9953056974🔝(=)/CALL GIRLS SERVICE

why an Opensea Clone Script might be your perfect match.pdf

Short Story: Unveiling the Reasoning Abilities of Large Language Models by Ke...

Steps To Getting Up And Running Quickly With MyTimeClock Employee Scheduling ...

Exploring iOS App Development: Simplifying the Process

Tech Tuesday-Harness the Power of Effective Resource Planning with OnePlan’s ...

Reassessing the Bedrock of Clinical Function Models: An Examination of Large ...

Advancing Engineering with AI through the Next Generation of Strategic Projec...

Unveiling the Tech Salsa of LAMs with Janus in Real-Time Applications

The Real-World Challenges of Medical Device Cybersecurity- Mitigating Vulnera...

5 Signs You Need a Fashion PLM Software.pdf

Test Automation Strategy for Frontend and Backend

A Secure and Reliable Document Management System is Essential.docx

Optimizing AI for immediate response in Smart CCTV

How To Use Server-Side Rendering with Nuxt.js

The Ultimate Test Automation Guide_ Best Practices and Tips.pdf

Learn the Fundamentals of XCUITest Framework_ A Beginner's Guide.pdf

How To Troubleshoot Collaboration Apps for the Modern Connected Worker

Hand gesture recognition PROJECT PPT.pptx

Microsoft AI Transformation Partner Playbook.pdf

How to become a Git power user

1. GIT POWER USER Ilmari Kontulainen @kontulai @deveoteam #gitpoweruser Viimeksi muokattu: 9. Tammikuuta 2015Luottamuksellinen

2. • Git Aliases • Rewriting history • Fast context switching • Different merging strategies Topics

3. Git aliases

4. • git config --global alias.co checkout • git config --global alias.br branch • git config --global alias.ci commit • git config --global alias.st status • git config --global alias.dc diff --cached • git config --global alias.hist ‘log --graph --oneline --decorate --all’ • git config --global alias.unstage 'reset HEAD --' • git config --global alias.last 'log -1 HEAD' Git Aliases

5. • git config --global alias.helloworld ‘!echo “Hello world”’ • git config --global alias.hello ‘!f() { echo Hello $1; }; f’ • git config --global alias.co-recurse '!sh -c “git checkout $1 && git submodule update --recursive" -' Execute any shell command with aliases

6. Rewriting history

7. • git commit --amend • git rebase • git rebase -i Rewriting history

8. • Modify last commit • Or simply edit the commit message • Changes the commit commit • Deveo prevents pushing changed history to master branch by default git commit --amend

9. • Base the work on my branch to some other branch • creates new commits git rebase https://git-scm.com/book/en/v2/book/03-git-branching/images/basic-rebase-1.png

10. git rebase

11. git rebase

12. git rebase -i • Clean up the history of your feature branch • pick • squash, ﬁxup • drop • edit or reword

13. Fast context switching

14. • git stash • git stash --keep-index • git stash --include-untracked • git stash --all • git stash --patch Fast context switching

15. Different merge strategies

16. • regular merge • -- no-ff / --ff-only (Deveo uses --no-ff) • --squash • merging multiple branches into one Different merging strategies

17. https://git-scm.com/book Next webinar 1st of Dec 2016