Git rerere

10
git rerere Reuse Recorded Resolution @pismute | pete@weaveus | github.com/pismute

TAGS:

Transcript of Git rerere

Page 1: Git rerere

git rerereReuse Recorded Resolution

@pismute | pete@weaveus | github.com/pismute

Page 2: Git rerere

Enable rerere$ git config --global rerere.enabled 1

Page 3: Git rerere

Conflict Branches

Page 4: Git rerere
Page 5: Git rerere

resolve conflict

• $ git checkout master

• $ git checkout HEAD^0 ## detached

• $ git merge i18n-world

• > conflict, but Recorded preimage for 'hello.js' ## rerere effect!!

• ... resolve

• $ git add . && git commit -m'merged'

Page 6: Git rerere

resolve conflict

Page 7: Git rerere

conflict resolution

Page 8: Git rerere

reuse resolution

• $ git checkout i18n-world

• $ git rebase master

Page 9: Git rerere

reuse resolution

• $ git add .

• $ git rebase --continue

Page 10: Git rerere

Solved rebasing


2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Git Tricks — git utilities that make life git easier

Git Tricks — git utilities that make life git easier

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Smacking Git Around Advanced Git Tricks

Smacking Git Around Advanced Git Tricks

Fedora Classroom · 2018. 8. 13. · Git repository: Fedora Council Docs Git repository: Quick Docs Git repository: Mentored Projects Git repository: Fedora Modularity Git repository:

Fedora Classroom · 2018. 8. 13. · Git repository: Fedora Council Docs Git repository: Quick Docs Git repository: Mentored Projects Git repository: Fedora Modularity Git repository:

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Git j club magnets in GIT.

Git j club magnets in GIT.

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdf2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers,

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdf2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers,

Migrating to Git: Let's Git this party started · Git: •git fast-import CVS content into temporary Git repository •Git-move-refs •git prune, repack, gc and repack •Validate

Migrating to Git: Let's Git this party started · Git: •git fast-import CVS content into temporary Git repository •Git-move-refs •git prune, repack, gc and repack •Validate

Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

Git - Single Repository - Drexel Universitykschmidt/CS265/Lectures/Git/git-single.pdfGit - Single Repository Kurt Schmidt Intro First Repository git init git add ... The Actual Repository

Git - Single Repository - Drexel Universitykschmidt/CS265/Lectures/Git/git-single.pdfGit - Single Repository Kurt Schmidt Intro First Repository git init git add ... The Actual Repository

Git and GitHub · • GitHub (git, SVN) • Bitbucket (git, Mercurial) • Gitlab (git) • SourceForge (git, SVN) Why GitHub: • Makes sharing easy • Serves as Dropbox for backups

Git and GitHub · • GitHub (git, SVN) • Bitbucket (git, Mercurial) • Gitlab (git) • SourceForge (git, SVN) Why GitHub: • Makes sharing easy • Serves as Dropbox for backups

GIT Advanced (handout) - IRISApeople.irisa.fr/Anthony.Baire/git/git-advanced-handout.pdf · Reminders Internals Revisions Index Rewrite Interop Submodules Patches AnnexScaling GIT

GIT Advanced (handout) - IRISApeople.irisa.fr/Anthony.Baire/git/git-advanced-handout.pdf · Reminders Internals Revisions Index Rewrite Interop Submodules Patches AnnexScaling GIT

YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM ...

YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM ...

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdfTitle: 2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdfTitle: 2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past

A brief introduction to git & GitHubkbroman/presentations/Git...git clone git@github.com:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

A brief introduction to git & GitHubkbroman/presentations/Git...git clone [email protected]:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

Git & GitHub - polito.it · •really lightweight in Git •commands: –git branch [branch-name], create a new branch –git branch, lists all existing branches –git checkout [branch-name],

Git & GitHub - polito.it · •really lightweight in Git •commands: –git branch [branch-name], create a new branch –git branch, lists all existing branches –git checkout [branch-name],

Git & e git beginner workshop

Git & e git beginner workshop