{"id":75,"date":"2025-01-01T05:22:38","date_gmt":"2025-01-01T05:22:38","guid":{"rendered":"https:\/\/techkubo.com\/git\/?p=75"},"modified":"2025-05-23T19:13:31","modified_gmt":"2025-05-23T19:13:31","slug":"git-rebase","status":"publish","type":"post","link":"https:\/\/techkubo.com\/git\/git-rebase\/","title":{"rendered":"Git rebase"},"content":{"rendered":"\n

git rebase<\/code> integrates two branches into a single branch, similar to git merge<\/code>, but with one key difference: it rewrites the commit history. This makes the commit history linear, which can be useful for consolidating multiple private branches into one.<\/p>\n\n\n\n

Initial Example<\/h2>\n\n\n\n

To rebase your current branch onto another base branch, use:<\/p>\n\n\n\n

$ git rebase <base><\/pre><\/div>\n\n\n\n
<\/p>\n\n\n\n
REBASE Options<\/h2>\n\n\n\n
Option<\/th>Description<\/th><\/tr><\/thead>
-i<\/code>, --interactive<\/code><\/td>Rebase in interactive mode. Allows you to edit, reorder, or squash commits.<\/td><\/tr>
-p<\/code>, --preserve-merges<\/code><\/td>Recreate merge commits instead of flattening the history.<\/td><\/tr>
-r<\/code>, --rebase-merges[=<rebase-merges-options>]<\/code><\/td>Rebase merge commits by flattening them, or use the options to control the behavior of the merge commits during rebase.<\/td><\/tr>
--onto<\/code><\/td>Rebase onto a specific commit instead of the direct parent.<\/td><\/tr>
--keep-base<\/code><\/td>Keep the base commit of the branch being rebased.<\/td><\/tr>
--continue<\/code><\/td>Continue the rebase process after resolving conflicts.<\/td><\/tr>
--abort<\/code><\/td>Abort the rebase and reset to the original branch.<\/td><\/tr>
--skip<\/code><\/td>Skip the current commit and continue with the rebase.<\/td><\/tr>
-X <strategy-option><\/code><\/td>Pass a specific option to the merge strategy.<\/td><\/tr>
--autostash<\/code><\/td>Automatically stash local changes before rebasing and apply them after the rebase.<\/td><\/tr>
--no-autostash<\/code><\/td>Do not automatically stash local changes before rebasing.<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
<\/p>\n\n\n\n
Examples<\/h2>\n\n\n\n
1. Basic Rebase<\/h4>\n\n\n\n
To rebase your current branch onto the main<\/code> branch:<\/p>\n\n\n\n
    \n
  • First, ensure you are on the branch you want to rebase:<\/li>\n<\/ul>\n\n\n\n
    $ git checkout feature<\/pre><\/div>\n\n\n\n
      \n
    • Then, run the rebase command:<\/li>\n<\/ul>\n\n\n\n
      $ git rebase main<\/pre><\/div>\n\n\n\n
      <\/p>\n\n\n\n
      2. Resolving Conflicts<\/h4>\n\n\n\n
      If there are conflicts during the rebase, Git will pause and highlight the conflicts:<\/p>\n\n\n\n
        \n
      • Check the conflicted files:<\/li>\n<\/ul>\n\n\n\n
        $ git status<\/pre><\/div>\n\n\n\n
          \n
        • Resolve the conflicts by editing the files:<\/li>\n<\/ul>\n\n\n\n
          $ nano conflicted_file.txt<\/pre><\/div>\n\n\n\n
            \n
          • After resolving the conflicts, add the files to the staging area:<\/li>\n<\/ul>\n\n\n\n
            $ git add conflicted_file.txt<\/pre><\/div>\n\n\n\n
              \n
            • Continue the rebase process:<\/li>\n<\/ul>\n\n\n\n
              $ git rebase --continue<\/pre><\/div>\n","protected":false},"excerpt":{"rendered":"
              git rebase integrates two branches into a single branch, similar to git merge, but with one key difference: it rewrites […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"site-sidebar-layout":"default","site-content-layout":"","ast-site-content-layout":"","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"","footer-sml-layout":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"default","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"categories":[1],"tags":[],"class_list":["post-75","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit rebase - GIT Tutorial<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/techkubo.com\/git\/git-rebase\/\" \/>\n<meta property=\"og:locale\" content=\"en_US\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git rebase - GIT Tutorial\" \/>\n<meta property=\"og:description\" content=\"git rebase integrates two branches into a single branch, similar to git merge, but with one key difference: it rewrites […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/techkubo.com\/git\/git-rebase\/\" \/>\n<meta property=\"og:site_name\" content=\"GIT Tutorial\" \/>\n<meta property=\"article:published_time\" content=\"2025-01-01T05:22:38+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2025-05-23T19:13:31+00:00\" \/>\n<meta name=\"author\" content=\"Manong\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"Manong\" \/>\n\t<meta name=\"twitter:label2\" content=\"Est. reading time\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 minutes\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\/\/techkubo.com\/git\/git-rebase\/#article\",\"isPartOf\":{\"@id\":\"https:\/\/techkubo.com\/git\/git-rebase\/\"},\"author\":{\"name\":\"Manong\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965\"},\"headline\":\"Git rebase\",\"datePublished\":\"2025-01-01T05:22:38+00:00\",\"dateModified\":\"2025-05-23T19:13:31+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/techkubo.com\/git\/git-rebase\/\"},\"wordCount\":235,\"commentCount\":0,\"publisher\":{\"@id\":\"https:\/\/techkubo.com\/git\/#organization\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"CommentAction\",\"name\":\"Comment\",\"target\":[\"https:\/\/techkubo.com\/git\/git-rebase\/#respond\"]}]},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/techkubo.com\/git\/git-rebase\/\",\"url\":\"https:\/\/techkubo.com\/git\/git-rebase\/\",\"name\":\"Git rebase - GIT Tutorial\",\"isPartOf\":{\"@id\":\"https:\/\/techkubo.com\/git\/#website\"},\"datePublished\":\"2025-01-01T05:22:38+00:00\",\"dateModified\":\"2025-05-23T19:13:31+00:00\",\"breadcrumb\":{\"@id\":\"https:\/\/techkubo.com\/git\/git-rebase\/#breadcrumb\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/techkubo.com\/git\/git-rebase\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/techkubo.com\/git\/git-rebase\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\/\/techkubo.com\/git\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git rebase\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/techkubo.com\/git\/#website\",\"url\":\"https:\/\/techkubo.com\/git\/\",\"name\":\"GIT Tutorial\",\"description\":\"\",\"publisher\":{\"@id\":\"https:\/\/techkubo.com\/git\/#organization\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/techkubo.com\/git\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"en-US\"},{\"@type\":\"Organization\",\"@id\":\"https:\/\/techkubo.com\/git\/#organization\",\"name\":\"GIT Tutorial\",\"url\":\"https:\/\/techkubo.com\/git\/\",\"logo\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/\",\"url\":\"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png\",\"contentUrl\":\"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png\",\"width\":1620,\"height\":1166,\"caption\":\"GIT Tutorial\"},\"image\":{\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/\"}},{\"@type\":\"Person\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965\",\"name\":\"Manong\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g\",\"caption\":\"Manong\"},\"sameAs\":[\"https:\/\/techkubo.com\"],\"url\":\"https:\/\/techkubo.com\/git\/author\/manong\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Git rebase - GIT Tutorial","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/techkubo.com\/git\/git-rebase\/","og_locale":"en_US","og_type":"article","og_title":"Git rebase - GIT Tutorial","og_description":"git rebase integrates two branches into a single branch, similar to git merge, but with one key difference: it rewrites […]","og_url":"https:\/\/techkubo.com\/git\/git-rebase\/","og_site_name":"GIT Tutorial","article_published_time":"2025-01-01T05:22:38+00:00","article_modified_time":"2025-05-23T19:13:31+00:00","author":"Manong","twitter_card":"summary_large_image","twitter_misc":{"Written by":"Manong","Est. reading time":"2 minutes"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/techkubo.com\/git\/git-rebase\/#article","isPartOf":{"@id":"https:\/\/techkubo.com\/git\/git-rebase\/"},"author":{"name":"Manong","@id":"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965"},"headline":"Git rebase","datePublished":"2025-01-01T05:22:38+00:00","dateModified":"2025-05-23T19:13:31+00:00","mainEntityOfPage":{"@id":"https:\/\/techkubo.com\/git\/git-rebase\/"},"wordCount":235,"commentCount":0,"publisher":{"@id":"https:\/\/techkubo.com\/git\/#organization"},"inLanguage":"en-US","potentialAction":[{"@type":"CommentAction","name":"Comment","target":["https:\/\/techkubo.com\/git\/git-rebase\/#respond"]}]},{"@type":"WebPage","@id":"https:\/\/techkubo.com\/git\/git-rebase\/","url":"https:\/\/techkubo.com\/git\/git-rebase\/","name":"Git rebase - GIT Tutorial","isPartOf":{"@id":"https:\/\/techkubo.com\/git\/#website"},"datePublished":"2025-01-01T05:22:38+00:00","dateModified":"2025-05-23T19:13:31+00:00","breadcrumb":{"@id":"https:\/\/techkubo.com\/git\/git-rebase\/#breadcrumb"},"inLanguage":"en-US","potentialAction":[{"@type":"ReadAction","target":["https:\/\/techkubo.com\/git\/git-rebase\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/techkubo.com\/git\/git-rebase\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/techkubo.com\/git\/"},{"@type":"ListItem","position":2,"name":"Git rebase"}]},{"@type":"WebSite","@id":"https:\/\/techkubo.com\/git\/#website","url":"https:\/\/techkubo.com\/git\/","name":"GIT Tutorial","description":"","publisher":{"@id":"https:\/\/techkubo.com\/git\/#organization"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/techkubo.com\/git\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"en-US"},{"@type":"Organization","@id":"https:\/\/techkubo.com\/git\/#organization","name":"GIT Tutorial","url":"https:\/\/techkubo.com\/git\/","logo":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/","url":"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png","contentUrl":"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png","width":1620,"height":1166,"caption":"GIT Tutorial"},"image":{"@id":"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/"}},{"@type":"Person","@id":"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965","name":"Manong","image":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/techkubo.com\/git\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g","caption":"Manong"},"sameAs":["https:\/\/techkubo.com"],"url":"https:\/\/techkubo.com\/git\/author\/manong\/"}]}},"_links":{"self":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts\/75"}],"collection":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/comments?post=75"}],"version-history":[{"count":2,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts\/75\/revisions"}],"predecessor-version":[{"id":172,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts\/75\/revisions\/172"}],"wp:attachment":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/media?parent=75"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/categories?post=75"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/tags?post=75"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}