CINXE.COM
Git - Rerere
<!DOCTYPE html> <html lang="pt-br"> <head> <meta charset='utf-8'> <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Git - Rerere</title> <link href="/favicon.ico" rel='shortcut icon' type='image/x-icon'> <link rel="stylesheet" href="/application.min.css"> <script src="/js/modernizr.js"></script> <script src="/js/modernize.js"></script> </head> <body id="documentation"> <div class="inner"> <header> <a href="/"><img src="/images/logo@2x.png" width="110" height="46" alt="Git" /></a> <span id="tagline"></span> <script type="text/javascript"> const taglines = [ "fast-version-control", "everything-is-local", "distributed-even-if-your-workflow-isnt", "local-branching-on-the-cheap", "distributed-is-the-new-centralized" ]; var tagline = taglines[Math.floor(Math.random() * taglines.length)]; document.getElementById('tagline').innerHTML = '--' + tagline; </script> <form id="search" action="/search/results"> <input id="search-text" name="search" placeholder="Type / to search entire site…" autocomplete="off" type="text" /> </form> <div id="search-results"></div> </header> </div> <div class="inner"> <div id="content-wrapper"> <div tabindex="1" class="sidebar-btn"></div> <aside class="sidebar" id="sidebar"> <nav> <ul> <li> <a href="/about">About</a> <ul> </ul> </li> <li> <a href="/doc" class="active">Documentation</a> <ul class="expanded"> <li> <a href="/docs">Reference</a> </li> <li> <a href="/book" class="active">Book</a> </li> <li> <a href="/videos">Videos</a> </li> <li> <a href="/doc/ext">External Links</a> </li> </ul> </li> <li> <a href="/downloads">Downloads</a> <ul > <li> <a href="/downloads/guis">GUI Clients</a> </li> <li> <a href="/downloads/logos">Logos</a> </li> </ul> </li> <li> <a href="/community">Community</a> </li> </ul> <hr class="sidebar"> <p> This book is available in <a href="/book/en/v2/Git-Tools-Rerere">English</a>. </p> <p> Full translation available in <table> <tr><td><a href="/book/az/v2/Git-Al%c9%99tl%c9%99ri-Rerere">azərbaycan dili</a>,</td></tr> <tr><td><a href="/book/bg">български език</a>,</td></tr> <tr><td><a href="/book/de/v2/Git-Tools-Rerere">Deutsch</a>,</td></tr> <tr><td><a href="/book/es/v2/Herramientas-de-Git-Rerere">Español</a>,</td></tr> <tr><td><a href="/book/fr/v2/Utilitaires-Git-Rerere">Français</a>,</td></tr> <tr><td><a href="/book/gr">Ελληνικά</a>,</td></tr> <tr><td><a href="/book/ja/v2/Git-%e3%81%ae%e3%81%95%e3%81%be%e3%81%96%e3%81%be%e3%81%aa%e3%83%84%e3%83%bc%e3%83%ab-Rerere">日本語</a>,</td></tr> <tr><td><a href="/book/ko/v2/Git-%eb%8f%84%ea%b5%ac-Rerere">한국어</a>,</td></tr> <tr><td><a href="/book/nl/v2/Git-Tools-Rerere">Nederlands</a>,</td></tr> <tr><td><a href="/book/ru/v2/%d0%98%d0%bd%d1%81%d1%82%d1%80%d1%83%d0%bc%d0%b5%d0%bd%d1%82%d1%8b-Git-Rerere">Русский</a>,</td></tr> <tr><td><a href="/book/sl/v2/Orodja-Git-Rerere">Slovenščina</a>,</td></tr> <tr><td><a href="/book/tl/v2/Mga-Git-na-Kasangkapan-Ang-Rerere">Tagalog</a>,</td></tr> <tr><td><a href="/book/uk/v2/%d0%86%d0%bd%d1%81%d1%82%d1%80%d1%83%d0%bc%d0%b5%d0%bd%d1%82%d0%b8-Git-Rerere">Українська</a></td></tr> <tr><td><a href="/book/zh/v2/Git-%e5%b7%a5%e5%85%b7-Rerere">简体中文</a>,</td></tr> </table> </p> <p> Partial translations available in <table> <tr><td><a href="/book/cs/v2/Git-Tools-Rerere">Čeština</a>,</td></tr> <tr><td><a href="/book/mk/v2/Git-%d0%90%d0%bb%d0%b0%d1%82%d0%ba%d0%b8-Rerere">Македонски</a>,</td></tr> <tr><td><a href="/book/pl/v2/Narz%c4%99dzia-Gita-Rerere">Polski</a>,</td></tr> <tr><td><a href="/book/sr/v2/%d0%93%d0%b8%d1%82-%d0%b0%d0%bb%d0%b0%d1%82%d0%b8-Rerere">Српски</a>,</td></tr> <tr><td><a href="/book/uz/v2/Git-Tools-Rerere">Ўзбекча</a>,</td></tr> <tr><td><a href="/book/zh-tw/v2/Git-%e5%b7%a5%e5%85%b7-Rerere">繁體中文</a>,</td></tr> </table> </p> <p> Translations started for <table> <tr><td><a href="/book/be/v2/Git-Tools-Rerere">Беларуская</a>,</td></tr> <tr><td><a href="/book/fa/v2/Git-Tools-Rerere" dir="rtl">فارسی</a>,</td></tr> <tr><td><a href="/book/id/v2/Git-Tools-Rerere">Indonesian</a>,</td></tr> <tr><td><a href="/book/it/v2/Git-Tools-Rerere">Italiano</a>,</td></tr> <tr><td><a href="/book/ms/v2/Git-Tools-Rerere">Bahasa Melayu</a>,</td></tr> <tr><td><a href="/book/pt-br/v2/Git-Tools-Rerere">Português (Brasil)</a>,</td></tr> <tr><td><a href="/book/pt-pt/v2/Ferramentas-do-Git-Rerere">Português (Portugal)</a>,</td></tr> <tr><td><a href="/book/sv/v2/Git-Tools-Rerere">Svenska</a>,</td></tr> <tr><td><a href="/book/tr/v2/Git-Ara%c3%a7lar%c4%b1-Rerere">Türkçe</a>.</td></tr> </table> </p> <hr class="sidebar"/> <p> The source of this book is <a href="https://github.com/progit/progit2-pt-br">hosted on GitHub.</a></br> Patches, suggestions and comments are welcome. </p> </nav> </aside> <div id="content"> <div id="book-chapters"> <a class="dropdown-trigger" id="book-chapters-trigger" data-panel-id="chapters-dropdown" href="#">Chapters ▾</a> <div class='dropdown-panel' id='chapters-dropdown'> <div class='three-column'> <div class="column-left"> <ol class='book-toc'> <li class='chapter'> <h2>1. <a href="/book/pt-br/v2/Come%c3%a7ando-Sobre-Controle-de-Vers%c3%a3o">Começando</a></h2> <ol> <li> 1.1 <a href="/book/pt-br/v2/Come%c3%a7ando-Sobre-Controle-de-Vers%c3%a3o">Sobre Controle de Versão</a> </li> <li> 1.2 <a href="/book/pt-br/v2/Come%c3%a7ando-Uma-Breve-Hist%c3%b3ria-do-Git">Uma Breve História do Git</a> </li> <li> 1.3 <a href="/book/pt-br/v2/Come%c3%a7ando-O-B%c3%a1sico-do-Git">O Básico do Git</a> </li> <li> 1.4 <a href="/book/pt-br/v2/Come%c3%a7ando-A-Linha-de-Comando">A Linha de Comando</a> </li> <li> 1.5 <a href="/book/pt-br/v2/Come%c3%a7ando-Instalando-o-Git">Instalando o Git</a> </li> <li> 1.6 <a href="/book/pt-br/v2/Come%c3%a7ando-Configura%c3%a7%c3%a3o-Inicial-do-Git">Configuração Inicial do Git</a> </li> <li> 1.7 <a href="/book/pt-br/v2/Come%c3%a7ando-Pedindo-Ajuda">Pedindo Ajuda</a> </li> <li> 1.8 <a href="/book/pt-br/v2/Come%c3%a7ando-Sum%c3%a1rio">Sumário</a> </li> </ol> </li> <li class='chapter'> <h2>2. <a href="/book/pt-br/v2/Fundamentos-de-Git-Obtendo-um-Reposit%c3%b3rio-Git">Fundamentos de Git</a></h2> <ol> <li> 2.1 <a href="/book/pt-br/v2/Fundamentos-de-Git-Obtendo-um-Reposit%c3%b3rio-Git">Obtendo um Repositório Git</a> </li> <li> 2.2 <a href="/book/pt-br/v2/Fundamentos-de-Git-Gravando-Altera%c3%a7%c3%b5es-em-Seu-Reposit%c3%b3rio">Gravando Alterações em Seu Repositório</a> </li> <li> 2.3 <a href="/book/pt-br/v2/Fundamentos-de-Git-Vendo-o-hist%c3%b3rico-de-Commits">Vendo o histórico de Commits</a> </li> <li> 2.4 <a href="/book/pt-br/v2/Fundamentos-de-Git-Desfazendo-coisas">Desfazendo coisas</a> </li> <li> 2.5 <a href="/book/pt-br/v2/Fundamentos-de-Git-Trabalhando-de-Forma-Remota">Trabalhando de Forma Remota</a> </li> <li> 2.6 <a href="/book/pt-br/v2/Fundamentos-de-Git-Criando-Tags">Criando Tags</a> </li> <li> 2.7 <a href="/book/pt-br/v2/Fundamentos-de-Git-Apelidos-Git">Apelidos Git</a> </li> <li> 2.8 <a href="/book/pt-br/v2/Fundamentos-de-Git-Sum%c3%a1rio">Sumário</a> </li> </ol> </li> <li class='chapter'> <h2>3. <a href="/book/pt-br/v2/Branches-no-Git-Branches-em-poucas-palavras">Branches no Git</a></h2> <ol> <li> 3.1 <a href="/book/pt-br/v2/Branches-no-Git-Branches-em-poucas-palavras">Branches em poucas palavras</a> </li> <li> 3.2 <a href="/book/pt-br/v2/Branches-no-Git-O-b%c3%a1sico-de-Ramifica%c3%a7%c3%a3o-Branch-e-Mesclagem-Merge">O básico de Ramificação (Branch) e Mesclagem (Merge)</a> </li> <li> 3.3 <a href="/book/pt-br/v2/Branches-no-Git-Gest%c3%a3o-de-Branches">Gestão de Branches</a> </li> <li> 3.4 <a href="/book/pt-br/v2/Branches-no-Git-Fluxo-de-Branches">Fluxo de Branches</a> </li> <li> 3.5 <a href="/book/pt-br/v2/Branches-no-Git-Branches-remotos">Branches remotos</a> </li> <li> 3.6 <a href="/book/pt-br/v2/Branches-no-Git-Rebase">Rebase</a> </li> <li> 3.7 <a href="/book/pt-br/v2/Branches-no-Git-Sum%c3%a1rio">Sumário</a> </li> </ol> </li> <li class='chapter'> <h2>4. <a href="/book/pt-br/v2/Git-no-servidor-Os-Protocolos">Git no servidor</a></h2> <ol> <li> 4.1 <a href="/book/pt-br/v2/Git-no-servidor-Os-Protocolos">Os Protocolos</a> </li> <li> 4.2 <a href="/book/pt-br/v2/Git-no-servidor-Getting-Git-on-a-Server">Getting Git on a Server</a> </li> <li> 4.3 <a href="/book/pt-br/v2/Git-no-servidor-Gerando-Sua-Chave-P%c3%bablica-SSH">Gerando Sua Chave Pública SSH</a> </li> <li> 4.4 <a href="/book/pt-br/v2/Git-no-servidor-Setting-Up-the-Server">Setting Up the Server</a> </li> <li> 4.5 <a href="/book/pt-br/v2/Git-no-servidor-Git-Daemon">Git Daemon</a> </li> <li> 4.6 <a href="/book/pt-br/v2/Git-no-servidor-Smart-HTTP">Smart HTTP</a> </li> <li> 4.7 <a href="/book/pt-br/v2/Git-no-servidor-GitWeb">GitWeb</a> </li> <li> 4.8 <a href="/book/pt-br/v2/Git-no-servidor-GitLab">GitLab</a> </li> <li> 4.9 <a href="/book/pt-br/v2/Git-no-servidor-Third-Party-Hosted-Options">Third Party Hosted Options</a> </li> <li> 4.10 <a href="/book/pt-br/v2/Git-no-servidor-Sum%c3%a1rio">Sumário</a> </li> </ol> </li> <li class='chapter'> <h2>5. <a href="/book/pt-br/v2/Distributed-Git-Fluxos-de-Trabalho-Distribu%c3%addos">Distributed Git</a></h2> <ol> <li> 5.1 <a href="/book/pt-br/v2/Distributed-Git-Fluxos-de-Trabalho-Distribu%c3%addos">Fluxos de Trabalho Distribuídos</a> </li> <li> 5.2 <a href="/book/pt-br/v2/Distributed-Git-Contribuindo-com-um-Projeto">Contribuindo com um Projeto</a> </li> <li> 5.3 <a href="/book/pt-br/v2/Distributed-Git-Maintaining-a-Project">Maintaining a Project</a> </li> <li> 5.4 <a href="/book/pt-br/v2/Distributed-Git-Summary">Summary</a> </li> </ol> </li> </ol> </div> <div class='column-middle'> <ol class='book-toc'> <li class='chapter'> <h2>6. <a href="/book/pt-br/v2/GitHub-Configurando-uma-conta">GitHub</a></h2> <ol> <li> 6.1 <a href="/book/pt-br/v2/GitHub-Configurando-uma-conta">Configurando uma conta</a> </li> <li> 6.2 <a href="/book/pt-br/v2/GitHub-Contribuindo-em-um-projeto">Contribuindo em um projeto</a> </li> <li> 6.3 <a href="/book/pt-br/v2/GitHub-Maintaining-a-Project">Maintaining a Project</a> </li> <li> 6.4 <a href="/book/pt-br/v2/GitHub-Managing-an-organization">Managing an organization</a> </li> <li> 6.5 <a href="/book/pt-br/v2/GitHub-Scripting-GitHub">Scripting GitHub</a> </li> <li> 6.6 <a href="/book/pt-br/v2/GitHub-Summary">Summary</a> </li> </ol> </li> <li class='chapter'> <h2>7. <a href="/book/pt-br/v2/Git-Tools-Revision-Selection">Git Tools</a></h2> <ol> <li> 7.1 <a href="/book/pt-br/v2/Git-Tools-Revision-Selection">Revision Selection</a> </li> <li> 7.2 <a href="/book/pt-br/v2/Git-Tools-Interactive-Staging">Interactive Staging</a> </li> <li> 7.3 <a href="/book/pt-br/v2/Git-Tools-Stashing-and-Cleaning">Stashing and Cleaning</a> </li> <li> 7.4 <a href="/book/pt-br/v2/Git-Tools-Signing-Your-Work">Signing Your Work</a> </li> <li> 7.5 <a href="/book/pt-br/v2/Git-Tools-Searching">Searching</a> </li> <li> 7.6 <a href="/book/pt-br/v2/Git-Tools-Rewriting-History">Rewriting History</a> </li> <li> 7.7 <a href="/book/pt-br/v2/Git-Tools-Reset-Demystified">Reset Demystified</a> </li> <li> 7.8 <a href="/book/pt-br/v2/Git-Tools-Advanced-Merging">Advanced Merging</a> </li> <li> 7.9 <a href="/book/pt-br/v2/Git-Tools-Rerere" class="active">Rerere</a> </li> <li> 7.10 <a href="/book/pt-br/v2/Git-Tools-Debugging-with-Git">Debugging with Git</a> </li> <li> 7.11 <a href="/book/pt-br/v2/Git-Tools-Submodules">Submodules</a> </li> <li> 7.12 <a href="/book/pt-br/v2/Git-Tools-Bundling">Bundling</a> </li> <li> 7.13 <a href="/book/pt-br/v2/Git-Tools-Replace">Replace</a> </li> <li> 7.14 <a href="/book/pt-br/v2/Git-Tools-Credential-Storage">Credential Storage</a> </li> <li> 7.15 <a href="/book/pt-br/v2/Git-Tools-Summary">Summary</a> </li> </ol> </li> <li class='chapter'> <h2>8. <a href="/book/pt-br/v2/Customizing-Git-Git-Configuration">Customizing Git</a></h2> <ol> <li> 8.1 <a href="/book/pt-br/v2/Customizing-Git-Git-Configuration">Git Configuration</a> </li> <li> 8.2 <a href="/book/pt-br/v2/Customizing-Git-Git-Attributes">Git Attributes</a> </li> <li> 8.3 <a href="/book/pt-br/v2/Customizing-Git-Git-Hooks">Git Hooks</a> </li> <li> 8.4 <a href="/book/pt-br/v2/Customizing-Git-An-Example-Git-Enforced-Policy">An Example Git-Enforced Policy</a> </li> <li> 8.5 <a href="/book/pt-br/v2/Customizing-Git-Summary">Summary</a> </li> </ol> </li> <li class='chapter'> <h2>9. <a href="/book/pt-br/v2/Git-and-Other-Systems-Git-as-a-Client">Git and Other Systems</a></h2> <ol> <li> 9.1 <a href="/book/pt-br/v2/Git-and-Other-Systems-Git-as-a-Client">Git as a Client</a> </li> <li> 9.2 <a href="/book/pt-br/v2/Git-and-Other-Systems-Migrating-to-Git">Migrating to Git</a> </li> <li> 9.3 <a href="/book/pt-br/v2/Git-and-Other-Systems-Summary">Summary</a> </li> </ol> </li> <li class='chapter'> <h2>10. <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Encanamento-e-Porcelana">Funcionamento Interno do Git</a></h2> <ol> <li> 10.1 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Encanamento-e-Porcelana">Encanamento e Porcelana</a> </li> <li> 10.2 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Objetos-do-Git">Objetos do Git</a> </li> <li> 10.3 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Refer%c3%aancias-do-Git">Referências do Git</a> </li> <li> 10.4 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Packfiles">Packfiles</a> </li> <li> 10.5 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-The-Refspec">The Refspec</a> </li> <li> 10.6 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Transfer-Protocols">Transfer Protocols</a> </li> <li> 10.7 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Maintenance-and-Data-Recovery">Maintenance and Data Recovery</a> </li> <li> 10.8 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Vari%c3%a1veis-de-ambiente">Variáveis de ambiente</a> </li> <li> 10.9 <a href="/book/pt-br/v2/Funcionamento-Interno-do-Git-Sum%c3%a1rio">Sumário</a> </li> </ol> </li> </ol> </div> <div class='column-right'> <ol class='book-toc'> <li class='chapter'> <h2>A1. <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Graphical-Interfaces">Appendix A: Git em Outros Ambientes</a></h2> <ol> <li> A1.1 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Graphical-Interfaces">Graphical Interfaces</a> </li> <li> A1.2 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Git-in-Visual-Studio">Git in Visual Studio</a> </li> <li> A1.3 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Git-in-Eclipse">Git in Eclipse</a> </li> <li> A1.4 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Git-in-Bash">Git in Bash</a> </li> <li> A1.5 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Git-in-Zsh">Git in Zsh</a> </li> <li> A1.6 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Git-in-Powershell">Git in Powershell</a> </li> <li> A1.7 <a href="/book/pt-br/v2/Appendix-A:-Git-em-Outros-Ambientes-Resumo">Resumo</a> </li> </ol> </li> <li class='chapter'> <h2>A2. <a href="/book/pt-br/v2/Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git">Appendix B: Embedding Git in your Applications</a></h2> <ol> <li> A2.1 <a href="/book/pt-br/v2/Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git">Command-line Git</a> </li> <li> A2.2 <a href="/book/pt-br/v2/Appendix-B:-Embedding-Git-in-your-Applications-Libgit2">Libgit2</a> </li> <li> A2.3 <a href="/book/pt-br/v2/Appendix-B:-Embedding-Git-in-your-Applications-JGit">JGit</a> </li> </ol> </li> <li class='chapter'> <h2>A3. <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Setup-and-Config">Appendix C: Git Commands</a></h2> <ol> <li> A3.1 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Setup-and-Config">Setup and Config</a> </li> <li> A3.2 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Getting-and-Creating-Projects">Getting and Creating Projects</a> </li> <li> A3.3 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Basic-Snapshotting">Basic Snapshotting</a> </li> <li> A3.4 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Branching-and-Merging">Branching and Merging</a> </li> <li> A3.5 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Sharing-and-Updating-Projects">Sharing and Updating Projects</a> </li> <li> A3.6 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Inspection-and-Comparison">Inspection and Comparison</a> </li> <li> A3.7 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Debugging">Debugging</a> </li> <li> A3.8 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Patching">Patching</a> </li> <li> A3.9 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Email">Email</a> </li> <li> A3.10 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-External-Systems">External Systems</a> </li> <li> A3.11 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Administration">Administration</a> </li> <li> A3.12 <a href="/book/pt-br/v2/Appendix-C:-Git-Commands-Plumbing-Commands">Plumbing Commands</a> </li> </ol> </li> </ol> </div> </div> </div> <span class="light" id="edition"> 2nd Edition </span> </div> <div id="main" data-pagefind-filter="category:book" data-pagefind-meta="category:Book" data-pagefind-weight="0.05" data-pagefind-body class="book edition2"> <h1>7.9 Git Tools - Rerere</h1> <div> <h2 id="r_rerere">Rerere</h2> <div class="paragraph"> <p>The <code>git rerere</code> functionality is a bit of a hidden feature. The name stands for “reuse recorded resolution” and as the name implies, it allows you to ask Git to remember how you’ve resolved a hunk conflict so that the next time it sees the same conflict, Git can automatically resolve it for you.</p> </div> <div class="paragraph"> <p>There are a number of scenarios in which this functionality might be really handy. One of the examples that is mentioned in the documentation is if you want to make sure a long lived topic branch will merge cleanly but don’t want to have a bunch of intermediate merge commits. With <code>rerere</code> turned on you can merge occasionally, resolve the conflicts, then back out the merge. If you do this continuously, then the final merge should be easy because <code>rerere</code> can just do everything for you automatically.</p> </div> <div class="paragraph"> <p>This same tactic can be used if you want to keep a branch rebased so you don’t have to deal with the same rebasing conflicts each time you do it. Or if you want to take a branch that you merged and fixed a bunch of conflicts and then decide to rebase it instead - you likely won’t have to do all the same conflicts again.</p> </div> <div class="paragraph"> <p>Another situation is where you merge a bunch of evolving topic branches together into a testable head occasionally, as the Git project itself often does. If the tests fail, you can rewind the merges and re-do them without the topic branch that made the tests fail without having to re-resolve the conflicts again.</p> </div> <div class="paragraph"> <p>To enable the <code>rerere</code> functionality, you simply have to run this config setting:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git config --global rerere.enabled true</code></pre> </div> </div> <div class="paragraph"> <p>You can also turn it on by creating the <code>.git/rr-cache</code> directory in a specific repository, but the config setting is clearer and it can be done globally.</p> </div> <div class="paragraph"> <p>Now let’s see a simple example, similar to our previous one. Let’s say we have a file named <code>hello.rb</code> that looks like this:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-ruby" data-lang="ruby">#! /usr/bin/env ruby def hello puts 'hello world' end</code></pre> </div> </div> <div class="paragraph"> <p>In one branch we change the word “hello” to “hola”, then in another branch we change the “world” to “mundo”, just like before.</p> </div> <div class="imageblock"> <div class="content"> <img src="/book/pt-br/v2/images/rerere1.png" alt="rerere1"> </div> </div> <div class="paragraph"> <p>When we merge the two branches together, we’ll get a merge conflict:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git merge i18n-world Auto-merging hello.rb CONFLICT (content): Merge conflict in hello.rb Recorded preimage for 'hello.rb' Automatic merge failed; fix conflicts and then commit the result.</code></pre> </div> </div> <div class="paragraph"> <p>You should notice the new line <code>Recorded preimage for FILE</code> in there. Otherwise it should look exactly like a normal merge conflict. At this point, <code>rerere</code> can tell us a few things. Normally, you might run <code>git status</code> at this point to see what all conflicted:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git status # On branch master # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add <file>..." to mark resolution) # # both modified: hello.rb #</code></pre> </div> </div> <div class="paragraph"> <p>However, <code>git rerere</code> will also tell you what it has recorded the pre-merge state for with <code>git rerere status</code>:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git rerere status hello.rb</code></pre> </div> </div> <div class="paragraph"> <p>And <code>git rerere diff</code> will show the current state of the resolution - what you started with to resolve and what you’ve resolved it to.</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git rerere diff --- a/hello.rb +++ b/hello.rb @@ -1,11 +1,11 @@ #! /usr/bin/env ruby def hello -<<<<<<< - puts 'hello mundo' -======= +<<<<<<< HEAD puts 'hola world' ->>>>>>> +======= + puts 'hello mundo' +>>>>>>> i18n-world end</code></pre> </div> </div> <div class="paragraph"> <p>Also (and this isn’t really related to <code>rerere</code>), you can use <code>ls-files -u</code> to see the conflicted files and the before, left and right versions:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git ls-files -u 100644 39804c942a9c1f2c03dc7c5ebcd7f3e3a6b97519 1 hello.rb 100644 a440db6e8d1fd76ad438a49025a9ad9ce746f581 2 hello.rb 100644 54336ba847c3758ab604876419607e9443848474 3 hello.rb</code></pre> </div> </div> <div class="paragraph"> <p>Now you can resolve it to just be <code>puts 'hola mundo'</code> and you can run the <code>rerere diff</code> command again to see what rerere will remember:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git rerere diff --- a/hello.rb +++ b/hello.rb @@ -1,11 +1,7 @@ #! /usr/bin/env ruby def hello -<<<<<<< - puts 'hello mundo' -======= - puts 'hola world' ->>>>>>> + puts 'hola mundo' end</code></pre> </div> </div> <div class="paragraph"> <p>So that basically says, when Git sees a hunk conflict in a <code>hello.rb</code> file that has “hello mundo” on one side and “hola world” on the other, it will resolve it to “hola mundo”.</p> </div> <div class="paragraph"> <p>Now we can mark it as resolved and commit it:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git add hello.rb $ git commit Recorded resolution for 'hello.rb'. [master 68e16e5] Merge branch 'i18n'</code></pre> </div> </div> <div class="paragraph"> <p>You can see that it "Recorded resolution for FILE".</p> </div> <div class="imageblock"> <div class="content"> <img src="/book/pt-br/v2/images/rerere2.png" alt="rerere2"> </div> </div> <div class="paragraph"> <p>Now, let’s undo that merge and then rebase it on top of our master branch instead. We can move our branch back by using <code>reset</code> as we saw in <a href="/book/pt-br/v2/ch00/r_git_reset">Reset Demystified</a>.</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello</code></pre> </div> </div> <div class="paragraph"> <p>Our merge is undone. Now let’s rebase the topic branch.</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git checkout i18n-world Switched to branch 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging hello.rb CONFLICT (content): Merge conflict in hello.rb Resolved 'hello.rb' using previous resolution. Failed to merge in the changes. Patch failed at 0001 i18n one word</code></pre> </div> </div> <div class="paragraph"> <p>Now, we got the same merge conflict like we expected, but take a look at the <code>Resolved FILE using previous resolution</code> line. If we look at the file, we’ll see that it’s already been resolved, there are no merge conflict markers in it.</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-ruby" data-lang="ruby">#! /usr/bin/env ruby def hello puts 'hola mundo' end</code></pre> </div> </div> <div class="paragraph"> <p>Also, <code>git diff</code> will show you how it was automatically re-resolved:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git diff diff --cc hello.rb index a440db6,54336ba..0000000 --- a/hello.rb +++ b/hello.rb @@@ -1,7 -1,7 +1,7 @@@ #! /usr/bin/env ruby def hello - puts 'hola world' - puts 'hello mundo' ++ puts 'hola mundo' end</code></pre> </div> </div> <div class="imageblock"> <div class="content"> <img src="/book/pt-br/v2/images/rerere3.png" alt="rerere3"> </div> </div> <div class="paragraph"> <p>You can also recreate the conflicted file state with the <code>checkout</code> command:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git checkout --conflict=merge hello.rb $ cat hello.rb #! /usr/bin/env ruby def hello <<<<<<< ours puts 'hola world' ======= puts 'hello mundo' >>>>>>> theirs end</code></pre> </div> </div> <div class="paragraph"> <p>We saw an example of this in <a href="/book/pt-br/v2/ch00/r_advanced_merging">Advanced Merging</a>. For now though, let’s re-resolve it by just running <code>rerere</code> again:</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git rerere Resolved 'hello.rb' using previous resolution. $ cat hello.rb #! /usr/bin/env ruby def hello puts 'hola mundo' end</code></pre> </div> </div> <div class="paragraph"> <p>We have re-resolved the file automatically using the <code>rerere</code> cached resolution. You can now add and continue the rebase to complete it.</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-console" data-lang="console">$ git add hello.rb $ git rebase --continue Applying: i18n one word</code></pre> </div> </div> <div class="paragraph"> <p>So, if you do a lot of re-merges, or want to keep a topic branch up to date with your master branch without a ton of merges, or you rebase often, you can turn on <code>rerere</code> to help your life out a bit.</p> </div> <div id="nav"><a href="/book/pt-br/v2/Git-Tools-Advanced-Merging">prev</a> | <a href="/book/pt-br/v2/Git-Tools-Debugging-with-Git">next</a></div> </div> </div> </div> </div> <footer> <div class="site-source"> <a href="/site">About this site</a><br> Patches, suggestions, and comments are welcome. </div> <div class="sfc-member"> Git is a member of <a href="/sfc">Software Freedom Conservancy</a> </div> </footer> <a href="#top" class="no-js scrollToTop" id="scrollToTop" data-label="Scroll to top"> <img src="/images/icons/chevron-up@2x.png" width="20" height="20" alt="scroll-to-top"/> </a> <script src="/js/jquery-1.7.1.min.js"></script> <script src="/js/jquery-ui-1.8.18.custom.min.js"></script> <script src="/js/jquery.defaultvalue.js"></script> <script src="/js/session.min.js"></script> <script src="/js/application.min.js"></script> </div> </body> </html>