\n| <\/td>\n | <\/td>\n | AE\u2032<\/td>\n | \u2190<\/td>\n | F\u2032<\/td>\n | \u2190<\/td>\n | G\u2032<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n The conventional way to do this is to check out the branch and perform an interactive rebase, squashing together commits A<\/var> through E<\/var> to form a new commit AE\u2032<\/var>, and then picking commits F<\/var> and G<\/var>, producing F\u2032<\/var> and G\u2032<\/var>.<\/p>\nHowever, the conventional way may not be the convenient way. You may have moved on and checked out a different branch to to some other work, and returning to this branch for some squashing action would churn your working directory, forcing unwanted rebuilds.<\/p>\n Or you might still be on that branch, but rewinding back to base<\/var> is going to churn so many files that it will invalidate all the build collateral you’ve created, forcing you to rebuild them pointlessly. For example, part of the work in adding the X<\/var> component may have involved changing a centrally-used header file, which means that your entire project will have to rebuild.<\/p>\nSince all of the commits we want to squash are consecutive, we can do all this squashing by simply committing trees.<\/p>\n git commit-tree E^{tree} -p base -m \"Write component X\"\r\n<\/pre>\nNote<\/b>: As before, if using the Windows CMD<\/code> command prompt, you need to double the ^<\/tt> character because it is the CMD<\/code> escape character.<\/p>\nThis command prints out a hash, which is our AE\u2032<\/var>.<\/p>\nNow we can stack F<\/var> and G<\/var> on top of it:<\/p>\ngit commit-tree F^{tree} -p AE\u2032<\/var> -m \"Update Y\"\r\n<\/pre>\nThis prints a hash, which is our F\u2032<\/var>.<\/p>\ngit commit-tree G^{tree} -p F\u2032<\/var> -m \"Update Z\"\r\n<\/pre>\nThis prints a hash, which is our G\u2032<\/var>.<\/p>\nWe can now reset the local branch to that commit, and then push it.<\/p>\n If the branch you are “virtually rebasing” is the current branch, you can reset to it.<\/p>\n git reset --soft G\u2032<\/var>\r\n<\/pre>\nSince the trees for G<\/var> and G\u2032<\/var> are identical, this has no effect on your index. Any files that were staged remain staged, with exactly the same changes.<\/p>\nIf you are virtually rebasing a non-checked-out branch, then you can update it, and even push it, without checking it out:<\/p>\n git branch -f that-branch G\u2032<\/var>\r\ngit push -f origin that-branch\r\n<\/pre>\nOr we could bypass our local branch and push directly to the remote.<\/p>\n git push -f origin G\u2032<\/var>:that-branch\r\n<\/pre>\nThe point is that we were able to rewrite a branch without touching any files in the working directory.<\/p>\n \n |