{"id":9170,"date":"2023-12-26T05:53:55","date_gmt":"2023-12-26T02:23:55","guid":{"rendered":"https:\/\/rasanegar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/"},"modified":"2023-12-26T05:53:55","modified_gmt":"2023-12-26T02:23:55","slug":"%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing","status":"publish","type":"post","link":"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/","title":{"rendered":"\u06a9\u062a\u0627\u0628 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc Git Rebase \u2013 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc \u0642\u0637\u0639\u06cc \u0628\u0631\u0627\u06cc Rebasing"},"content":{"rendered":"<div id=\"ez-toc-container\" class=\"ez-toc-v2_0_85 counter-hierarchy ez-toc-counter ez-toc-custom ez-toc-container-direction\">\n<div class=\"ez-toc-title-container\"><p class=\"ez-toc-title\" style=\"cursor:inherit\">\u0633\u0631\u0641\u0635\u0644\u0647\u0627\u06cc \u0645\u0637\u0644\u0628<\/p>\n<\/div><nav><ul class='ez-toc-list ez-toc-list-level-1 ' ><ul class='ez-toc-list-level-2' ><li class='ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-1\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%86%da%a9%d8%a7%d8%aa%db%8c_%d9%82%d8%a8%d9%84_%d8%a7%d8%b2_%d8%b4%d8%b1%d9%88%d8%b9\" >\u0646\u06a9\u0627\u062a\u06cc \u0642\u0628\u0644 \u0627\u0632 \u0634\u0631\u0648\u0639<\/a><\/li><\/ul><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-2\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d8%ae%d9%84%d8%a7%d8%b5%d9%87_%da%a9%d9%88%d8%aa%d8%a7%d9%87_%e2%80%93_git_merge_%da%86%db%8c%d8%b3%d8%aa%d8%9f_%f0%9f%a4%94\" >\u062e\u0644\u0627\u0635\u0647 \u06a9\u0648\u062a\u0627\u0647 &#8211; Git Merge \u0686\u06cc\u0633\u062a\u061f  \ud83e\udd14<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-3\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%da%86%d8%b7%d9%88%d8%b1_%d8%a7%d8%b3%d8%aa_git_rebase_%d9%85%d8%aa%d9%81%d8%a7%d9%88%d8%aa_%d8%a7%d8%b2_git_merge_%f0%9f%a4%94\" >\u0686\u0637\u0648\u0631 \u0627\u0633\u062a git rebase \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0632 git merge?  \ud83e\udd14<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-4\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#cherry-pick_%d8%a8%d9%87_%d8%b9%d9%86%d9%88%d8%a7%d9%86_%d9%be%d8%a7%db%8c%d9%87_%d8%a7%db%8c_%d8%a8%d8%b1%d8%a7%db%8c_rebase\" >cherry-pick  \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u067e\u0627\u06cc\u0647 \u0627\u06cc \u0628\u0631\u0627\u06cc Rebase<\/a><ul class='ez-toc-list-level-2' ><li class='ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-5\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%81%d8%b1%d8%a7%d8%aa%d8%b1_cherry-pick_%e2%80%93_%d9%86%d8%ad%d9%88%d9%87_%d8%a7%d8%b3%d8%aa%d9%81%d8%a7%d8%af%d9%87_git_rebase\" >\u0641\u0631\u0627\u062a\u0631 cherry-pick &#8211; \u0646\u062d\u0648\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 git rebase<\/a><\/li><\/ul><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-6\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%88%d9%82%d8%aa_%d8%a2%d9%86_%d8%a7%d8%b3%d8%aa_%da%a9%d9%87_%d8%a8%d8%a7_rebase_%d8%af%d8%b3%d8%aa_%d8%a8%d9%87_%da%a9%d8%a7%d8%b1_%d8%b4%d9%88%db%8c%d8%af%f0%9f%99%8c%f0%9f%8f%bb\" >\u0648\u0642\u062a \u0622\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0628\u0627 Rebase \u062f\u0633\u062a \u0628\u0647 \u06a9\u0627\u0631 \u0634\u0648\u06cc\u062f\ud83d\ude4c\ud83c\udffb<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-7\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#rebasing_%d9%be%db%8c%d8%b4%d8%b1%d9%81%d8%aa%d9%87_%d8%af%d8%b1_git%f0%9f%92%aa%f0%9f%8f%bb\" >Rebasing \u067e\u06cc\u0634\u0631\u0641\u062a\u0647 \u062f\u0631 Git\ud83d\udcaa\ud83c\udffb<\/a><ul class='ez-toc-list-level-2' ><li class='ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-8\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%86%d8%ad%d9%88%d9%87_%d8%a7%d8%b3%d8%aa%d9%81%d8%a7%d8%af%d9%87_%d8%a7%d8%b2_-onto_%d8%b3%d9%88%d8%a6%db%8c%da%86_%d8%a7%d8%b2_git_rebase\" >\u0646\u062d\u0648\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 --onto \u0633\u0648\u0626\u06cc\u0686 \u0627\u0632 git rebase<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-9\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%da%86%da%af%d9%88%d9%86%d9%87_%d8%a8%d8%b1_%d8%b1%d9%88%db%8c_%db%8c%da%a9_%d8%b4%d8%a7%d8%ae%d9%87_%d9%88%d8%a7%d8%ad%d8%af_%d9%85%d8%ac%d8%af%d8%af%d8%a7%d9%8b_%d9%be%d8%a7%db%8c%d9%87_%da%af%d8%b0%d8%a7%d8%b1%db%8c_%da%a9%d9%86%db%8c%d9%85\" >\u0686\u06af\u0648\u0646\u0647 \u0628\u0631 \u0631\u0648\u06cc \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u0648\u0627\u062d\u062f \u0645\u062c\u062f\u062f\u0627\u064b \u067e\u0627\u06cc\u0647 \u06af\u0630\u0627\u0631\u06cc \u06a9\u0646\u06cc\u0645<\/a><\/li><\/ul><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-10\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%85%d9%88%d8%a7%d8%b1%d8%af_%d8%a7%d8%b3%d8%aa%d9%81%d8%a7%d8%af%d9%87_rebase_%d8%a8%db%8c%d8%b4%d8%aa%d8%b1_%d8%aa%d9%85%d8%b1%db%8c%d9%86_%d8%a8%db%8c%d8%b4%d8%aa%d8%b1\" >\u0645\u0648\u0627\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 Rebase \u0628\u06cc\u0634\u062a\u0631 + \u062a\u0645\u0631\u06cc\u0646 \u0628\u06cc\u0634\u062a\u0631<\/a><ul class='ez-toc-list-level-2' ><li class='ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-11\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%86%d8%ad%d9%88%d9%87_%d8%ad%d8%b0%d9%81_%d8%aa%d8%b9%d9%87%d8%af%d8%a7%d8%aa\" >\u0646\u062d\u0648\u0647 \u062d\u0630\u0641 \u062a\u0639\u0647\u062f\u0627\u062a<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-12\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%86%d8%ad%d9%88%d9%87_%d8%ac%d8%a7%d8%a8%d8%ac%d8%a7%db%8c%db%8c_commit_%d9%87%d8%a7_%d8%af%d8%b1_%d8%b4%d8%a7%d8%ae%d9%87_%d9%87%d8%a7\" >\u0646\u062d\u0648\u0647 \u062c\u0627\u0628\u062c\u0627\u06cc\u06cc commit \u0647\u0627 \u062f\u0631 \u0634\u0627\u062e\u0647 \u0647\u0627<\/a><\/li><\/ul><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-13\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%86%da%a9%d8%aa%d9%87_%d8%a7%db%8c_%d8%af%d8%b1_%d9%85%d9%88%d8%b1%d8%af_%d8%aa%d8%b9%d8%a7%d8%b1%d8%b6%d8%a7%d8%aa\" >\u0646\u06a9\u062a\u0647 \u0627\u06cc \u062f\u0631 \u0645\u0648\u0631\u062f \u062a\u0639\u0627\u0631\u0636\u0627\u062a<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-14\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d8%a8%d8%b2%d8%b1%da%af%d9%86%d9%85%d8%a7%db%8c%db%8c_%d8%a8%d8%b1%d8%a7%db%8c_%d8%aa%d8%b5%d9%88%db%8c%d8%b1_%d8%a8%d8%b2%d8%b1%da%af\" >\u0628\u0632\u0631\u06af\u0646\u0645\u0627\u06cc\u06cc \u0628\u0631\u0627\u06cc \u062a\u0635\u0648\u06cc\u0631 \u0628\u0632\u0631\u06af<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-15\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d8%ae%d9%84%d8%a7%d8%b5%d9%87\" >\u062e\u0644\u0627\u0635\u0647<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-16\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d9%85%d8%b1%d8%a7%d8%ac%d8%b9_%d8%a7%d8%b6%d8%a7%d9%81%db%8c\" >\u0645\u0631\u0627\u062c\u0639 \u0627\u0636\u0627\u0641\u06cc<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-17\" href=\"https:\/\/rasanegaar.com\/blog\/%da%a9%d8%aa%d8%a7%d8%a8-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-git-rebase-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%d9%82%d8%b7%d8%b9%db%8c-%d8%a8%d8%b1%d8%a7%db%8c-rebasing\/#%d8%af%d8%b1%d8%a8%d8%a7%d8%b1%d9%87_%d9%86%d9%88%db%8c%d8%b3%d9%86%d8%af%d9%87\" >\u062f\u0631\u0628\u0627\u0631\u0647 \u0646\u0648\u06cc\u0633\u0646\u062f\u0647<\/a><\/li><\/ul><\/nav><\/div>\n<span class=\"span-reading-time rt-reading-time\" style=\"display: block;\"><span class=\"rt-label rt-prefix\">\u0632\u0645\u0627\u0646 \u0644\u0627\u0632\u0645 \u0628\u0631\u0627\u06cc \u0645\u0637\u0627\u0644\u0639\u0647: <\/span> <span class=\"rt-time\"> 17<\/span> <span class=\"rt-label rt-postfix\">\u062f\u0642\u06cc\u0642\u0647<\/span><\/span><p> <br \/>\n<\/p>\n<section class=\"post-content \" data-test-label=\"post-content\">\n<p>\u06cc\u06a9\u06cc \u0627\u0632 \u0642\u062f\u0631\u062a\u0645\u0646\u062f\u062a\u0631\u06cc\u0646 \u0627\u0628\u0632\u0627\u0631\u0647\u0627\u06cc\u06cc \u06a9\u0647 \u06cc\u06a9 \u062a\u0648\u0633\u0639\u0647 \u062f\u0647\u0646\u062f\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u062f\u0631 \u062c\u0639\u0628\u0647 \u0627\u0628\u0632\u0627\u0631 \u062e\u0648\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f \u0627\u06cc\u0646 \u0627\u0633\u062a <code>git rebase<\/code>.  \u0628\u0627 \u0627\u06cc\u0646 \u062d\u0627\u0644\u060c \u0628\u0647 \u062f\u0644\u06cc\u0644 \u067e\u06cc\u0686\u06cc\u062f\u0647 \u0628\u0648\u062f\u0646 \u0648 \u0633\u0648\u0621 \u062a\u0641\u0627\u0647\u0645 \u0628\u062f\u0646\u0627\u0645 \u0627\u0633\u062a. <\/p>\n<p>\u062d\u0642\u06cc\u0642\u062a \u0627\u06cc\u0646 \u0627\u0633\u062a\u060c \u0627\u06af\u0631 \u0645\u062a\u0648\u062c\u0647 \u0634\u0648\u06cc\u062f \u06a9\u0647 \u0622\u0646 \u0686\u06cc\u0633\u062a <em>\u062f\u0631 \u062d\u0642\u06cc\u0642\u062a<\/em> \u0645\u06cc\u06a9\u0646\u062f\u060c <code>git rebase<\/code> \u0627\u0628\u0632\u0627\u0631\u06cc \u0628\u0633\u06cc\u0627\u0631 \u0632\u06cc\u0628\u0627 \u0648 \u0633\u0627\u062f\u0647 \u0628\u0631\u0627\u06cc \u062f\u0633\u062a\u06cc\u0627\u0628\u06cc \u0628\u0647 \u0645\u0648\u0627\u0631\u062f \u0645\u062e\u062a\u0644\u0641 \u062f\u0631 Git \u0627\u0633\u062a.<\/p>\n<p>\u062f\u0631 \u067e\u0633\u062a \u0647\u0627\u06cc \u0642\u0628\u0644\u06cc \u0645\u062a\u0648\u062c\u0647 \u0634\u062f\u06cc\u062f \u06a9\u0647 \u062a\u0641\u0627\u0648\u062a \u0647\u0627\u06cc Git \u0686\u06cc\u0633\u062a\u060c \u0627\u062f\u063a\u0627\u0645 \u0686\u06cc\u0633\u062a \u0648 \u0686\u06af\u0648\u0646\u0647 Git \u062a\u062f\u0627\u062e\u0644 \u0647\u0627\u06cc \u0627\u062f\u063a\u0627\u0645 \u0631\u0627 \u062d\u0644 \u0645\u06cc \u06a9\u0646\u062f.  \u062f\u0631 \u0627\u06cc\u0646 \u067e\u0633\u062a \u0645\u062a\u0648\u062c\u0647 \u062e\u0648\u0627\u0647\u06cc\u062f \u0634\u062f \u06a9\u0647 Git rebase \u0686\u06cc\u0633\u062a\u060c \u0686\u0631\u0627 \u0628\u0627 \u0627\u062f\u063a\u0627\u0645 \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a \u0648 \u0686\u06af\u0648\u0646\u0647 \u0628\u0627 \u0627\u0637\u0645\u06cc\u0646\u0627\u0646 \u062f\u0648\u0628\u0627\u0631\u0647 \u0628\u06cc\u0627\u06cc\u06cc\u062f.<\/p>\n<h2 id=\"notes-before-we-start\"><span class=\"ez-toc-section\" id=\"%d9%86%da%a9%d8%a7%d8%aa%db%8c_%d9%82%d8%a8%d9%84_%d8%a7%d8%b2_%d8%b4%d8%b1%d9%88%d8%b9\"><\/span>\u0646\u06a9\u0627\u062a\u06cc \u0642\u0628\u0644 \u0627\u0632 \u0634\u0631\u0648\u0639<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<ol>\n<li>\u0645\u0646 \u0647\u0645\u0686\u0646\u06cc\u0646 \u06cc\u06a9 \u0648\u06cc\u062f\u06cc\u0648 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u0645 \u06a9\u0647 \u0645\u062d\u062a\u0648\u0627\u06cc \u0627\u06cc\u0646 \u067e\u0633\u062a \u0631\u0627 \u067e\u0648\u0634\u0634 \u0645\u06cc \u062f\u0647\u062f.  \u0627\u06af\u0631 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u062f\u0631 \u06a9\u0646\u0627\u0631 \u062e\u0648\u0627\u0646\u062f\u0646 \u062a\u0645\u0627\u0634\u0627 \u06a9\u0646\u06cc\u062f\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0622\u0646 \u0631\u0627 \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0628\u06cc\u0627\u0628\u06cc\u062f.<\/li>\n<li>\u0627\u06af\u0631 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u0628\u0627 \u0645\u062e\u0632\u0646\u06cc \u06a9\u0647 \u0645\u0646 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0645 \u0628\u0627\u0632\u06cc \u06a9\u0646\u06cc\u062f \u0648 \u062f\u0633\u062a\u0648\u0631\u0627\u062a \u0631\u0627 \u0628\u0631\u0627\u06cc \u062e\u0648\u062f\u062a\u0627\u0646 \u0627\u0645\u062a\u062d\u0627\u0646 \u06a9\u0646\u06cc\u062f\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0645\u062e\u0632\u0646 \u0631\u0627 \u0627\u0632 \u0627\u06cc\u0646\u062c\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u06a9\u0646\u06cc\u062f.<\/li>\n<li>\u0645\u0646 \u062f\u0627\u0631\u0645 \u0631\u0648\u06cc \u06a9\u062a\u0627\u0628\u06cc \u062f\u0631\u0628\u0627\u0631\u0647 Git \u06a9\u0627\u0631 \u0645\u06cc \u06a9\u0646\u0645!  \u0622\u06cc\u0627 \u0639\u0644\u0627\u0642\u0647 \u0645\u0646\u062f \u0628\u0647 \u062e\u0648\u0627\u0646\u062f\u0646 \u0646\u0633\u062e\u0647 \u0647\u0627\u06cc \u0627\u0648\u0644\u06cc\u0647 \u0648 \u0627\u0631\u0627\u0626\u0647 \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u0647\u0633\u062a\u06cc\u062f\u061f  \u0628\u0631\u0627\u06cc \u0645\u0646 \u06cc\u06a9 \u0627\u06cc\u0645\u06cc\u0644 \u0628\u0641\u0631\u0633\u062a\u06cc\u062f: gitting.things@gmail.com<\/li>\n<\/ol>\n<p>\u0628\u0627\u0634\u0647\u060c \u0622\u0645\u0627\u062f\u0647 \u0627\u06cc\u061f<\/p>\n<h1 id=\"short-recap-what-is-git-merge-\"><span class=\"ez-toc-section\" id=\"%d8%ae%d9%84%d8%a7%d8%b5%d9%87_%da%a9%d9%88%d8%aa%d8%a7%d9%87_%e2%80%93_git_merge_%da%86%db%8c%d8%b3%d8%aa%d8%9f_%f0%9f%a4%94\"><\/span>\u062e\u0644\u0627\u0635\u0647 \u06a9\u0648\u062a\u0627\u0647 &#8211; Git Merge \u0686\u06cc\u0633\u062a\u061f  \ud83e\udd14<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u062f\u0631 \u0632\u06cc\u0631 \u06a9\u0627\u067e\u0648\u062a\u060c <code>git rebase<\/code> \u0648 <code>git merge<\/code> \u0686\u06cc\u0632\u0647\u0627\u06cc \u0628\u0633\u06cc\u0627\u0631 \u0628\u0633\u06cc\u0627\u0631 \u0645\u062a\u0641\u0627\u0648\u062a\u06cc \u0647\u0633\u062a\u0646\u062f  \u067e\u0633 \u0686\u0631\u0627 \u0645\u0631\u062f\u0645 \u0647\u0645\u06cc\u0634\u0647 \u0622\u0646\u0647\u0627 \u0631\u0627 \u0628\u0627 \u0647\u0645 \u0645\u0642\u0627\u06cc\u0633\u0647 \u0645\u06cc \u06a9\u0646\u0646\u062f\u061f<\/p>\n<p>\u062f\u0644\u06cc\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0622\u0646\u0647\u0627\u0633\u062a.  \u0647\u0646\u06af\u0627\u0645 \u06a9\u0627\u0631 \u0628\u0627 \u06af\u06cc\u062a \u0645\u0639\u0645\u0648\u0644\u0627 \u062f\u0631 \u0634\u0627\u062e\u0647 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u06a9\u0627\u0631 \u0645\u06cc \u06a9\u0646\u06cc\u0645 \u0648 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u0631\u0627 \u062f\u0631 \u0622\u0646 \u0634\u0627\u062e\u0647 \u0647\u0627 \u0645\u0639\u0631\u0641\u06cc \u0645\u06cc \u06a9\u0646\u06cc\u0645. <\/p>\n<p>\u062f\u0631 \u06cc\u06a9 \u0622\u0645\u0648\u0632\u0634 \u0642\u0628\u0644\u06cc\u060c \u0645\u062b\u0627\u0644\u06cc \u0632\u062f\u0645 \u06a9\u0647 \u062f\u0631 \u0622\u0646 \u062c\u0627\u0646 \u0648 \u067e\u0644 (\u0627\u0632 \u06af\u0631\u0648\u0647 \u0628\u06cc\u062a\u0644\u0632) \u0622\u0647\u0646\u06af \u062c\u062f\u06cc\u062f\u06cc \u0631\u0627 \u0628\u0627 \u0647\u0645 \u0645\u06cc \u0646\u0648\u06cc\u0633\u0646\u062f.  \u0622\u0646\u0647\u0627 \u0627\u0632 <code>main<\/code> \u0634\u0627\u062e\u0647\u060c \u0648 \u0633\u067e\u0633 \u0647\u0631 \u06a9\u062f\u0627\u0645 \u0627\u0632 \u0647\u0645 \u062c\u062f\u0627 \u0634\u062f\u0646\u062f\u060c \u0627\u0634\u0639\u0627\u0631 \u0631\u0627 \u0627\u0635\u0644\u0627\u062d \u06a9\u0631\u062f\u0646\u062f \u0648 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u062e\u0648\u062f \u0631\u0627 \u0627\u0646\u062c\u0627\u0645 \u062f\u0627\u062f\u0646\u062f. <\/p>\n<p>\u0633\u067e\u0633\u060c \u0627\u06cc\u0646 \u062f\u0648 \u0645\u06cc \u062e\u0648\u0627\u0633\u062a\u0646\u062f \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u062e\u0648\u062f \u0631\u0627 \u0627\u062f\u063a\u0627\u0645 \u06a9\u0646\u0646\u062f\u060c \u0686\u06cc\u0632\u06cc \u06a9\u0647 \u0647\u0646\u06af\u0627\u0645 \u06a9\u0627\u0631 \u0628\u0627 Git \u0627\u063a\u0644\u0628 \u0627\u062a\u0641\u0627\u0642 \u0645\u06cc \u0627\u0641\u062a\u062f.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-197.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-197\" width=\"907\" height=\"341\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e \u0645\u062a\u0641\u0627\u0648\u062a &#8211; <code>paul_branch<\/code> \u0648 <code>john_branch<\/code> \u0627\u0632 <code>main<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0648 \u0631\u0627\u0647 \u0627\u0635\u0644\u06cc \u0628\u0631\u0627\u06cc \u0627\u062f\u063a\u0627\u0645 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062f\u0631 \u0634\u0627\u062e\u0647 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u062f\u0631 \u06af\u06cc\u062a \u06cc\u0627 \u0628\u0647 \u0639\u0628\u0627\u0631\u062a \u062f\u06cc\u06af\u0631 commit \u0647\u0627 \u0648 commit history \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f.  \u0627\u06cc\u0646\u0647\u0627 \u0627\u062f\u063a\u0627\u0645 \u0648 \u062a\u063a\u06cc\u06cc\u0631 \u067e\u0627\u06cc\u0647 \u0647\u0633\u062a\u0646\u062f.<\/p>\n<p>\u062f\u0631 \u0622\u0645\u0648\u0632\u0634 \u0642\u0628\u0644\u06cc \u0628\u0627 \u0647\u0645 \u0622\u0634\u0646\u0627 \u0634\u062f\u06cc\u0645 <code>git merge<\/code> \u0628\u0647 \u062e\u0648\u0628\u06cc.  \u062f\u06cc\u062f\u06cc\u0645 \u06a9\u0647 \u0647\u0646\u06af\u0627\u0645 \u0627\u0646\u062c\u0627\u0645 \u06cc\u06a9 \u0627\u062f\u063a\u0627\u0645\u060c a \u0627\u06cc\u062c\u0627\u062f \u0645\u06cc \u06a9\u0646\u06cc\u0645 <strong>\u0627\u062f\u063a\u0627\u0645 commit<\/strong> \u2013 \u06a9\u0647 \u0645\u062d\u062a\u0648\u06cc\u0627\u062a \u0627\u06cc\u0646 commit \u062a\u0631\u06a9\u06cc\u0628\u06cc \u0627\u0632 \u062f\u0648 \u0634\u0627\u062e\u0647 \u0627\u0633\u062a \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u062f\u0627\u0631\u0627\u06cc \u062f\u0648 \u0648\u0627\u0644\u062f \u0627\u0633\u062a \u06a9\u0647 \u062f\u0631 \u0647\u0631 \u0634\u0627\u062e\u0647 \u06cc\u06a9\u06cc \u0645\u06cc \u0628\u0627\u0634\u062f.<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u0628\u06af\u0648\u06cc\u06cc\u062f \u06a9\u0647 \u062f\u0631 \u0634\u0639\u0628\u0647 \u0647\u0633\u062a\u06cc\u062f <code>john_branch<\/code> (\u0628\u0627 \u0641\u0631\u0636 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0646\u0634\u0627\u0646 \u062f\u0627\u062f\u0647 \u0634\u062f\u0647 \u062f\u0631 \u0646\u0642\u0627\u0634\u06cc \u0628\u0627\u0644\u0627)\u060c \u0648 \u0634\u0645\u0627 \u0627\u062c\u0631\u0627 \u0645\u06cc \u06a9\u0646\u06cc\u062f <code>git merge paul_branch<\/code>.  \u0634\u0645\u0627 \u0628\u0647 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a \u062e\u0648\u0627\u0647\u06cc\u062f \u0631\u0633\u06cc\u062f &#8211; \u06a9\u062c\u0627 <code>john_branch<\/code>\u060c \u06cc\u06a9 \u062a\u0639\u0647\u062f \u062c\u062f\u06cc\u062f \u0628\u0627 \u062f\u0648 \u0648\u0627\u0644\u062f\u06cc\u0646 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f.  \u0627\u0648\u0644\u06cc\u0646 \u0645\u0648\u0631\u062f\u060c commit on \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f <code>john_branch<\/code> \u0634\u0639\u0628\u0647 \u06a9\u062c\u0627 <code>HEAD<\/code> \u0642\u0628\u0644 \u0627\u0632 \u0627\u0646\u062c\u0627\u0645 \u0627\u062f\u063a\u0627\u0645 \u0628\u0647 \u0622\u0646 \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0631\u062f\u060c \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f &#8211; &#8220;Commit 6&#8221;.  \u062f\u0648\u0645 \u062a\u0639\u0647\u062f\u06cc \u0627\u0633\u062a \u06a9\u0647 \u062a\u0648\u0633\u0637 \u0622\u0646 \u0627\u0634\u0627\u0631\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a <code>paul_branch<\/code>\u060c &#8220;\u062a\u0639\u0647\u062f 9&#8221;.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-196.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-196\" width=\"1037\" height=\"323\" loading=\"lazy\" title=\"\"><figcaption>\u0646\u062a\u06cc\u062c\u0647 \u062f\u0648\u06cc\u062f\u0646 <code>git merge paul_branch<\/code>: \u06cc\u06a9 \u0627\u062f\u063a\u0627\u0645 \u062c\u062f\u06cc\u062f \u0628\u0627 \u062f\u0648 \u0648\u0627\u0644\u062f\u06cc\u0646 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0648\u0628\u0627\u0631\u0647 \u0628\u0647 \u0646\u0645\u0648\u062f\u0627\u0631 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0646\u06af\u0627\u0647 \u06a9\u0646\u06cc\u062f: \u0634\u0645\u0627 \u06cc\u06a9 \u0631\u0627 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u06cc\u062f <strong>\u0648\u0627\u06af\u0631\u0627 \u0634\u062f<\/strong> \u062a\u0627\u0631\u06cc\u062e.  \u062f\u0631 \u0648\u0627\u0642\u0639 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0628\u06cc\u0646\u06cc\u062f \u06a9\u0647 \u06a9\u062c\u0627 \u0634\u0627\u062e\u0647 \u0634\u062f \u0648 \u062f\u0648\u0628\u0627\u0631\u0647 \u06a9\u062c\u0627 \u0627\u062f\u063a\u0627\u0645 \u0634\u062f.<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0647\u0646\u06af\u0627\u0645 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 <code>git merge<\/code>\u060c \u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc \u0646\u0645\u06cc \u06a9\u0646\u06cc\u062f &#8211; \u0628\u0644\u06a9\u0647 \u06cc\u06a9 commit \u0628\u0647 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0645\u0648\u062c\u0648\u062f \u0627\u0636\u0627\u0641\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u062f.  \u0648 \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635\u060c \u062a\u0639\u0647\u062f\u06cc \u06a9\u0647 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0627\u06cc \u0648\u0627\u06af\u0631\u0627 \u0627\u06cc\u062c\u0627\u062f \u0645\u06cc \u06a9\u0646\u062f.<\/p>\n<h1 id=\"how-is-git-rebase-different-than-git-merge-\"><span class=\"ez-toc-section\" id=\"%da%86%d8%b7%d9%88%d8%b1_%d8%a7%d8%b3%d8%aa_git_rebase_%d9%85%d8%aa%d9%81%d8%a7%d9%88%d8%aa_%d8%a7%d8%b2_git_merge_%f0%9f%a4%94\"><\/span>\u0686\u0637\u0648\u0631 \u0627\u0633\u062a <code>git rebase<\/code> \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0632 <code>git merge<\/code>?  \ud83e\udd14<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u0647\u0646\u06af\u0627\u0645 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>git rebase<\/code>\u060c \u0627\u062a\u0641\u0627\u0642 \u0645\u062a\u0641\u0627\u0648\u062a\u06cc \u0645\u06cc \u0627\u0641\u062a\u062f.  \ud83e\udd41<\/p>\n<p>\u0628\u06cc\u0627\u06cc\u06cc\u062f \u0628\u0627 \u062a\u0635\u0648\u06cc\u0631 \u0628\u0632\u0631\u06af \u0634\u0631\u0648\u0639 \u06a9\u0646\u06cc\u0645: \u0627\u06af\u0631 \u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631 \u0647\u0633\u062a\u06cc\u062f <code>paul_branch<\/code>\u060c \u0648 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git rebase john_branch<\/code>\u060c \u06af\u06cc\u062a \u0628\u0647 \u062c\u062f \u0645\u0634\u062a\u0631\u06a9 \u0634\u0627\u062e\u0647 \u062c\u0627\u0646 \u0648 \u0634\u0627\u062e\u0647 \u067e\u0644 \u0645\u06cc \u0631\u0648\u062f.  \u0633\u067e\u0633 \u0648\u0635\u0644\u0647\u200c\u0647\u0627\u06cc \u0645\u0639\u0631\u0641\u06cc\u200c\u0634\u062f\u0647 \u062f\u0631 commit\u200c\u0647\u0627\u06cc \u0634\u0627\u062e\u0647 Paul \u0631\u0627 \u0645\u06cc\u200c\u06af\u06cc\u0631\u062f \u0648 \u0622\u0646 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0631\u0627 \u062f\u0631 \u0634\u0627\u062e\u0647 John \u0627\u0639\u0645\u0627\u0644 \u0645\u06cc\u200c\u06a9\u0646\u062f. <\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627\u060c \u0634\u0645\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>rebase<\/code> \u0628\u0631\u0627\u06cc \u0628\u0631\u062f\u0627\u0634\u062a\u0646 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u06a9\u0647 \u062f\u0631 \u06cc\u06a9 \u0634\u0627\u062e\u0647 &#8211; \u0634\u0627\u062e\u0647 \u067e\u0644 &#8211; \u0627\u0646\u062c\u0627\u0645 \u0634\u062f\u0647 \u0648 \u0622\u0646\u0647\u0627 \u0631\u0627 \u062f\u0631 \u0634\u0627\u062e\u0647 \u062f\u06cc\u06af\u0631\u06cc \u067e\u062e\u0634 \u06a9\u0646\u06cc\u062f <code>john_branch<\/code>.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-198.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-198\" width=\"1154\" height=\"336\" loading=\"lazy\" title=\"\"><figcaption>\u0646\u062a\u06cc\u062c\u0647 \u062f\u0648\u06cc\u062f\u0646 <code>git rebase john_branch<\/code>: \u0645\u062a\u0639\u0647\u062f \u0645\u06cc \u0634\u0648\u062f <code>paul_branch<\/code> \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc \u0622\u0646 &#8220;\u0628\u0627\u0632\u067e\u062e\u0634&#8221; \u0634\u062f\u0646\u062f <code>john_branch<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0635\u0628\u0631 \u06a9\u0646 \u06cc\u0639\u0646\u06cc \u0686\u06cc\u061f  \ud83e\udd14<\/p>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u0627\u06cc\u0646 \u0631\u0627 \u0630\u0631\u0647 \u0630\u0631\u0647 \u0628\u0631\u0631\u0633\u06cc \u0645\u06cc \u06a9\u0646\u06cc\u0645 \u062a\u0627 \u0645\u0637\u0645\u0626\u0646 \u0634\u0648\u06cc\u0645 \u06a9\u0647 \u0628\u0647 \u0637\u0648\u0631 \u06a9\u0627\u0645\u0644 \u0645\u062a\u0648\u062c\u0647 \u0645\u06cc \u0634\u0648\u06cc\u062f \u06a9\u0647 \u062f\u0631 \u0632\u06cc\u0631 \u06a9\u0627\u067e\u0648\u062a \u0686\u0647 \u0627\u062a\u0641\u0627\u0642\u06cc \u0645\u06cc \u0627\u0641\u062a\u062f.<\/p>\n<h1 id=\"cherry-pick-as-a-basis-for-rebase\"><span class=\"ez-toc-section\" id=\"cherry-pick_%d8%a8%d9%87_%d8%b9%d9%86%d9%88%d8%a7%d9%86_%d9%be%d8%a7%db%8c%d9%87_%d8%a7%db%8c_%d8%a8%d8%b1%d8%a7%db%8c_rebase\"><\/span><code>cherry-pick<\/code>  \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u067e\u0627\u06cc\u0647 \u0627\u06cc \u0628\u0631\u0627\u06cc Rebase<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u0627\u06cc\u0646 \u0645\u0641\u06cc\u062f \u0627\u0633\u062a \u06a9\u0647 rebase \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0639\u0645\u0644\u06a9\u0631\u062f\u06cc \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f <code>git cherry-pick<\/code> &#8211; \u06cc\u06a9 \u0641\u0631\u0645\u0627\u0646 \u06cc\u06a9 commit \u0645\u06cc \u06af\u06cc\u0631\u062f\u060c \u0622\u0646 \u0631\u0627 \u0645\u062d\u0627\u0633\u0628\u0647 \u0645\u06cc \u06a9\u0646\u062f <em>\u067e\u0686<\/em> \u0627\u06cc\u0646 commit \u0628\u0627 \u0645\u062d\u0627\u0633\u0628\u0647 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 commit \u0648\u0627\u0644\u062f \u0648 \u062e\u0648\u062f commit \u0631\u0627 \u0645\u0639\u0631\u0641\u06cc \u0645\u06cc \u06a9\u0646\u062f \u0648 \u0633\u067e\u0633 <code>cherry-pick<\/code> \u0627\u06cc\u0646 \u062a\u0641\u0627\u0648\u062a \u0631\u0627 &#8220;\u0628\u0627\u0632\u067e\u062e\u0634&#8221; \u0645\u06cc \u06a9\u0646\u062f.<\/p>\n<p>\u0628\u06cc\u0627\u06cc\u06cc\u062f \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0631\u0627 \u0628\u0647 \u0635\u0648\u0631\u062a \u062f\u0633\u062a\u06cc \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u0645.<\/p>\n<p>\u0627\u06af\u0631 \u0628\u0647 \u062a\u0641\u0627\u0648\u062a \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 \u00abCommit 5\u00bb \u0628\u0627 \u0627\u062c\u0631\u0627 \u0646\u06af\u0627\u0647 \u06a9\u0646\u06cc\u0645 <code>git diff main &lt;SHA_OF_COMMIT_5&gt;<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-199.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-199\" width=\"559\" height=\"248\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u062f\u0648\u06cc\u062f\u0646 <code>git diff<\/code> \u0628\u0631\u0627\u06cc \u0645\u0634\u0627\u0647\u062f\u0647 \u067e\u0686 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 5&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>(\u0627\u06af\u0631 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u0628\u0627 \u0645\u062e\u0632\u0646 \u0645\u0648\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u0646 \u0628\u0627\u0632\u06cc \u06a9\u0646\u06cc\u062f \u0648 \u062f\u0633\u062a\u0648\u0631\u0627\u062a \u0631\u0627 \u0628\u0631\u0627\u06cc \u062e\u0648\u062f \u0627\u0645\u062a\u062d\u0627\u0646 \u06a9\u0646\u06cc\u062f\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0645\u062e\u0632\u0646 \u0631\u0627 \u0627\u0632 \u0627\u06cc\u0646\u062c\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u06a9\u0646\u06cc\u062f).<\/p>\n<p>\u0645\u06cc \u0628\u06cc\u0646\u06cc\u062f \u06a9\u0647 \u062f\u0631 \u0627\u06cc\u0646 \u06a9\u0627\u0645\u06cc\u062a\u060c \u062c\u0627\u0646 \u0634\u0631\u0648\u0639 \u0628\u0647 \u06a9\u0627\u0631 \u0631\u0648\u06cc \u0622\u0647\u0646\u06af\u06cc \u0628\u0647 \u0646\u0627\u0645 &#8220;Lucy in the Sky with Diamonds&#8221; \u06a9\u0631\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-200.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-200\" width=\"896\" height=\"666\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff<\/code> &#8211; \u067e\u0686 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 5&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0632 \u062f\u0633\u062a\u0648\u0631 \u0646\u06cc\u0632 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git show<\/code> \u0628\u0631\u0627\u06cc \u062f\u0631\u06cc\u0627\u0641\u062a \u0647\u0645\u0627\u0646 \u062e\u0631\u0648\u062c\u06cc:<\/p>\n<pre><code>git show &lt;SHA_OF_COMMIT_5&gt;<\/code><\/pre>\n<p>\u062d\u0627\u0644\u0627 \u0627\u06af\u0631 \u0634\u0645\u0627 <code>cherry-pick<\/code> \u062f\u0631 \u0627\u06cc\u0646 commit\u060c \u0627\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0631\u0627 \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635 \u062f\u0631 \u0634\u0627\u062e\u0647 \u0641\u0639\u0627\u0644 \u0645\u0639\u0631\u0641\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f.  \u062a\u063a\u06cc\u06cc\u0631 \u0628\u0647 <code>main<\/code> \u0627\u0648\u0644\u06cc\u0646:<\/p>\n<p><code>git checkout main<\/code>  (\u06cc\u0627 <code>git switch main<\/code>)<\/p>\n<p>\u0648 \u0641\u0642\u0637 \u0628\u0631\u0627\u06cc \u0631\u0648\u0634\u0646 \u0634\u062f\u0646 \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u062f\u06cc\u06af\u0631 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git checkout -b my_branch<\/code>  (\u06cc\u0627 <code>git switch -c my_branch<\/code>)<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-201.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-201\" width=\"607\" height=\"164\" loading=\"lazy\" title=\"\"><figcaption>\u067e\u062f\u06cc\u062f \u0622\u0648\u0631\u062f\u0646 <code>my_branch<\/code> \u06a9\u0647 \u0627\u0632 <code>main<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 <code>cherry-pick<\/code> \u0627\u06cc\u0646 \u062a\u0639\u0647\u062f:<\/p>\n<pre><code>git cherry-pick &lt;SHA_OF_COMMIT_5&gt;<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-202.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-202\" width=\"594\" height=\"113\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0646 <code>cherry-pick<\/code> \u0628\u0631\u0627\u06cc \u0627\u0639\u0645\u0627\u0644 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062f\u0631 &#8220;Commit 5&#8221; \u0628\u0631 \u0631\u0648\u06cc <code>main<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648\u0631\u0648\u062f \u0628\u0647 \u0633\u06cc\u0633\u062a\u0645 (\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git lol<\/code>):<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-205.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-205\" width=\"781\" height=\"141\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git lol<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>(<code>git lol<\/code> \u0646\u0627\u0645 \u0645\u0633\u062a\u0639\u0627\u0631\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0645\u0646 \u0628\u0647 Git \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0645 \u062a\u0627 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u0628\u0647 \u0635\u0648\u0631\u062a \u06af\u0631\u0627\u0641\u06cc\u06a9\u06cc \u0628\u0647 \u0648\u0636\u0648\u062d \u0628\u0628\u06cc\u0646\u0645.  \u0645\u06cc\u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u06cc\u0646\u062c\u0627 \u067e\u06cc\u062f\u0627\u06cc\u0634 \u06a9\u0646\u06cc\u062f).<\/p>\n<p>\u0627\u0646\u06af\u0627\u0631 \u062a\u0648 \u0647\u0633\u062a\u06cc <em>\u06a9\u067e\u06cc \u067e\u06cc\u0633\u062a \u0634\u062f<\/em> &#8220;\u062a\u0639\u0647\u062f 5&#8221;.  \u0628\u0647 \u06cc\u0627\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u062d\u062a\u06cc \u0627\u06af\u0631 \u067e\u06cc\u0627\u0645 commit \u06cc\u06a9\u0633\u0627\u0646\u06cc \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f\u060c \u0648 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u06cc\u06a9\u0633\u0627\u0646\u06cc \u0631\u0627 \u0645\u0639\u0631\u0641\u06cc \u0645\u06cc \u06a9\u0646\u062f\u060c \u0648 \u062d\u062a\u06cc \u0628\u0647 \u0647\u0645\u0627\u0646 \u0634\u06cc \u062f\u0631\u062e\u062a\u06cc \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 &#8220;Commit 5&#8221; \u0627\u0635\u0644\u06cc \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f &#8211; \u0647\u0645\u0686\u0646\u0627\u0646 \u06cc\u06a9 \u0634\u06cc commit \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0628\u0627 \u06cc\u06a9 \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u0627\u0633\u062a. \u0645\u0647\u0631 \u0632\u0645\u0627\u0646\u06cc \u0645\u062a\u0641\u0627\u0648\u062a<\/p>\n<p>\u0646\u06af\u0627\u0647\u06cc \u0628\u0647 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u060c \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>git show HEAD<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-204.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-204\" width=\"862\" height=\"643\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git show HEAD<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0622\u0646\u0647\u0627 \u0647\u0645\u0627\u0646 &#8220;Commit 5&#8221; \u0647\u0633\u062a\u0646\u062f.<\/p>\n<p>\u0648 \u0627\u0644\u0628\u062a\u0647\u060c \u0627\u06af\u0631 \u0628\u0647 \u0641\u0627\u06cc\u0644 \u0646\u06af\u0627\u0647 \u06a9\u0646\u06cc\u062f (\u0645\u062b\u0644\u0627\u064b \u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>nano lucy_in_the_sky_with_diamonds.md<\/code>)\u060c \u062f\u0631 \u0647\u0645\u0627\u0646 \u062d\u0627\u0644\u062a\u06cc \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f \u06a9\u0647 \u067e\u0633 \u0627\u0632 &#8220;Commit 5&#8221; \u0627\u0635\u0644\u06cc \u0628\u0648\u062f\u0647 \u0627\u0633\u062a.<\/p>\n<p>\u0633\u0631\u062f!  \ud83d\ude0e<\/p>\n<p>\u062e\u0648\u0628\u060c \u0627\u06a9\u0646\u0648\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0634\u0627\u062e\u0647 \u062c\u062f\u06cc\u062f \u0631\u0627 \u062d\u0630\u0641 \u06a9\u0646\u06cc\u062f \u062a\u0627 \u0647\u0631 \u0628\u0627\u0631 \u062f\u0631 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0634\u0645\u0627 \u0638\u0627\u0647\u0631 \u0646\u0634\u0648\u062f:<\/p>\n<pre><code>git checkout main\ngit branch -D my_branch<\/code><\/pre>\n<h2 id=\"beyond-cherry-pick-how-to-use-git-rebase\"><span class=\"ez-toc-section\" id=\"%d9%81%d8%b1%d8%a7%d8%aa%d8%b1_cherry-pick_%e2%80%93_%d9%86%d8%ad%d9%88%d9%87_%d8%a7%d8%b3%d8%aa%d9%81%d8%a7%d8%af%d9%87_git_rebase\"><\/span>\u0641\u0631\u0627\u062a\u0631 <code>cherry-pick<\/code> &#8211; \u0646\u062d\u0648\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 <code>git rebase<\/code><span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>\u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0646\u06af\u0627\u0647 \u06a9\u0646\u06cc\u062f <code>git rebase<\/code> \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0631\u0627\u0647\u06cc \u0628\u0631\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0686\u0646\u062f\u06af\u0627\u0646\u0647 <code>cherry-pick<\/code>\u06cc\u06a9\u06cc \u067e\u0633 \u0627\u0632 \u062f\u06cc\u06af\u0631\u06cc &#8211; \u06cc\u0639\u0646\u06cc &#8220;\u0628\u0627\u0632\u067e\u062e\u0634&#8221; \u0686\u0646\u062f\u06cc\u0646 commit.  \u0627\u06cc\u0646 \u062a\u0646\u0647\u0627 \u06a9\u0627\u0631\u06cc \u0646\u06cc\u0633\u062a \u06a9\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0627 \u0622\u0646 \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f <code>rebase<\/code>\u060c \u0627\u0645\u0627 \u0646\u0642\u0637\u0647 \u0634\u0631\u0648\u0639 \u062e\u0648\u0628\u06cc \u0628\u0631\u0627\u06cc \u062a\u0648\u0636\u06cc\u062d \u0645\u0627 \u0627\u0633\u062a.<\/p>\n<p>\u0632\u0645\u0627\u0646 \u0628\u0627\u0632\u06cc \u0627\u0633\u062a <code>git rebase<\/code>!  \ud83d\udc4f\ud83c\udffb\ud83d\udc4f\ud83c\udffb<\/p>\n<p>\u0642\u0628\u0644\u0627 \u0627\u062f\u063a\u0627\u0645 \u0634\u062f\u06cc <code>paul_branch<\/code> \u0628\u0647 <code>john_branch<\/code>.  \u0686\u0647 \u0627\u062a\u0641\u0627\u0642\u06cc \u0645\u06cc \u0627\u0641\u062a\u062f \u0627\u06af\u0631 \u0634\u0645\u0627 <em>\u0645\u062c\u062f\u062f\u0627\u064b \u067e\u0627\u06cc\u0647 \u06af\u0630\u0627\u0631\u06cc \u0634\u062f\u0647 \u0627\u0633\u062a<\/em> <code>paul_branch<\/code>  \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc  <code>john_branch<\/code>?  \u0634\u0645\u0627 \u06cc\u06a9 \u062a\u0627\u0631\u06cc\u062e \u0628\u0633\u06cc\u0627\u0631 \u0645\u062a\u0641\u0627\u0648\u062a \u062f\u0631\u06cc\u0627\u0641\u062a \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f.<\/p>\n<p>\u062f\u0631 \u0627\u0635\u0644\u060c \u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u06a9\u0647 \u0645\u0627 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0627\u0631\u0627\u0626\u0647 \u0634\u062f\u0647 \u062f\u0631 commit \u0647\u0627 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u06af\u0631\u0641\u062a\u0647 \u0627\u06cc\u0645 <code>paul_branch<\/code>\u060c \u0648 \u0622\u0646\u0647\u0627 \u0631\u0627 \u062f\u0648\u0628\u0627\u0631\u0647 \u067e\u062e\u0634 \u06a9\u0631\u062f <code>john_branch<\/code>.  \u0646\u062a\u06cc\u062c\u0647 \u06cc\u06a9 \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f <strong>\u062e\u0637\u06cc<\/strong> \u062a\u0627\u0631\u06cc\u062e.<\/p>\n<p>\u0628\u0631\u0627\u06cc \u062f\u0631\u06a9 \u0641\u0631\u0622\u06cc\u0646\u062f\u060c \u0646\u0645\u0627\u06cc \u0633\u0637\u062d \u0628\u0627\u0644\u0627 \u0631\u0627 \u0627\u0631\u0627\u0626\u0647 \u0645\u06cc\u200c\u062f\u0647\u0645 \u0648 \u0633\u067e\u0633 \u062f\u0631 \u0647\u0631 \u0645\u0631\u062d\u0644\u0647 \u0639\u0645\u06cc\u0642\u200c\u062a\u0631 \u0641\u0631\u0648 \u0645\u06cc\u200c\u0631\u0648\u0645.  \u0641\u0631\u0622\u06cc\u0646\u062f \u062a\u063a\u06cc\u06cc\u0631 \u067e\u0627\u06cc\u0647 \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u0628\u0631 \u0631\u0648\u06cc \u0634\u0627\u062e\u0647 \u062f\u06cc\u06af\u0631 \u0628\u0647 \u0634\u0631\u062d \u0632\u06cc\u0631 \u0627\u0633\u062a:<\/p>\n<ol>\n<li>\u062c\u062f \u0645\u0634\u062a\u0631\u06a9 \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u06cc\u062f.<\/li>\n<li>\u062a\u0639\u0647\u062f\u0627\u062a\u06cc \u0631\u0627 \u06a9\u0647 \u0642\u0631\u0627\u0631 \u0627\u0633\u062a \u00ab\u0628\u0627\u0632\u067e\u062e\u0634\u00bb \u0634\u0648\u0646\u062f\u060c \u0634\u0646\u0627\u0633\u0627\u06cc\u06cc \u06a9\u0646\u06cc\u062f.<\/li>\n<li>\u0628\u0631\u0627\u06cc \u0647\u0631 \u062a\u0639\u0647\u062f <code>X<\/code>\u060c \u0645\u062d\u0627\u0633\u0628\u0647 \u06a9\u0646\u06cc\u062f <code>diff(parent(X), X)<\/code>\u060c \u0648 \u0622\u0646 \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u06a9 \u0630\u062e\u06cc\u0631\u0647 \u06a9\u0646\u06cc\u062f <code>patch(X)<\/code>.<\/li>\n<li>\u062d\u0631\u06a9\u062a <code>HEAD<\/code> \u0628\u0647 \u067e\u0627\u06cc\u06af\u0627\u0647 \u062c\u062f\u06cc\u062f<\/li>\n<li>\u067e\u0686 \u0647\u0627\u06cc \u062a\u0648\u0644\u06cc\u062f \u0634\u062f\u0647 \u0631\u0627 \u0628\u0647 \u062a\u0631\u062a\u06cc\u0628 \u0631\u0648\u06cc \u0634\u0627\u062e\u0647 \u0647\u062f\u0641 \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u06cc\u062f.  \u0647\u0631 \u0628\u0627\u0631 \u06cc\u06a9 \u0634\u06cc commit \u062c\u062f\u06cc\u062f \u0628\u0627 \u062d\u0627\u0644\u062a \u062c\u062f\u06cc\u062f \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f.<\/li>\n<\/ol>\n<p>\u0641\u0631\u0622\u06cc\u0646\u062f \u0627\u06cc\u062c\u0627\u062f commit \u0647\u0627\u06cc \u062c\u062f\u06cc\u062f \u0628\u0627 \u0647\u0645\u0627\u0646 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0645\u0648\u062c\u0648\u062f \u0646\u06cc\u0632 \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc \u0634\u0648\u062f <strong>&#8220;\u0628\u0627\u0632\u067e\u062e\u0634&#8221;<\/strong> \u0622\u0646 commit \u0647\u0627\u060c \u0627\u0635\u0637\u0644\u0627\u062d\u06cc \u06a9\u0647 \u0642\u0628\u0644\u0627\u064b \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0647 \u0627\u06cc\u0645.<\/p>\n<h1 id=\"time-to-get-hands-on-with-rebase-\"><span class=\"ez-toc-section\" id=\"%d9%88%d9%82%d8%aa_%d8%a2%d9%86_%d8%a7%d8%b3%d8%aa_%da%a9%d9%87_%d8%a8%d8%a7_rebase_%d8%af%d8%b3%d8%aa_%d8%a8%d9%87_%da%a9%d8%a7%d8%b1_%d8%b4%d9%88%db%8c%d8%af%f0%9f%99%8c%f0%9f%8f%bb\"><\/span><strong>\u0648\u0642\u062a \u0622\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0628\u0627 Rebase \u062f\u0633\u062a \u0628\u0647 \u06a9\u0627\u0631 \u0634\u0648\u06cc\u062f\ud83d\ude4c\ud83c\udffb<\/strong><span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u0627\u0632 \u0634\u0639\u0628\u0647 \u067e\u0644 \u0634\u0631\u0648\u0639 \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git checkout paul_branch<\/code><\/pre>\n<p>\u0627\u06cc\u0646 \u062a\u0627\u0631\u06cc\u062e \u0627\u0633\u062a:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-206.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-206\" width=\"1642\" height=\"460\" loading=\"lazy\" title=\"\"><figcaption>\u0642\u0628\u0644 \u0627\u0632 \u0627\u062c\u0631\u0627 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u0645\u062a\u0639\u0647\u062f \u06a9\u0646\u06cc\u062f <code>git rebase<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u062d\u0627\u0644\u0627 \u0628\u0647 \u0642\u0633\u0645\u062a \u0647\u06cc\u062c\u0627\u0646 \u0627\u0646\u06af\u06cc\u0632\u0634 \u0645\u06cc \u0631\u0633\u06cc\u0645:<\/p>\n<pre><code>git rebase john_branch<\/code><\/pre>\n<p>\u0648 \u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u0645\u0634\u0627\u0647\u062f\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-207.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-207\" width=\"477\" height=\"268\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 rebasing (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>( <code>gg<\/code> \u0646\u0627\u0645 \u0645\u0633\u062a\u0639\u0627\u0631 \u06cc\u06a9 \u0627\u0628\u0632\u0627\u0631 \u062e\u0627\u0631\u062c\u06cc \u0627\u0633\u062a \u06a9\u0647 \u062f\u0631 \u0648\u06cc\u062f\u06cc\u0648 \u0645\u0639\u0631\u0641\u06cc \u06a9\u0631\u062f\u0645).<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0631 \u062d\u0627\u0644\u06cc \u06a9\u0647 \u0628\u0627 <code>git merge<\/code> \u0634\u0645\u0627 \u0628\u0647 \u062a\u0627\u0631\u06cc\u062e \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u06cc\u062f\u060c \u0628\u0627 <code>git rebase<\/code> \u0634\u0645\u0627 <strong>\u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc \u062a\u0627\u0631\u06cc\u062e<\/strong>.  \u0634\u0645\u0627 \u0627\u06cc\u062c\u0627\u062f \u0645\u06cc \u06a9\u0646\u06cc\u062f <strong>\u062c\u062f\u06cc\u062f<\/strong> \u0627\u0631\u062a\u06a9\u0627\u0628 \u0627\u0634\u06cc\u0627\u0621  \u0639\u0644\u0627\u0648\u0647 \u0628\u0631 \u0627\u06cc\u0646\u060c \u0646\u062a\u06cc\u062c\u0647 \u06cc\u06a9 \u0646\u0645\u0648\u062f\u0627\u0631 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u062e\u0637\u06cc \u0627\u0633\u062a &#8211; \u0646\u0647 \u06cc\u06a9 \u0646\u0645\u0648\u062f\u0627\u0631 \u0648\u0627\u06af\u0631\u0627.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-209.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-209\" width=\"2353\" height=\"645\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 rebasing (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0631 \u0627\u0635\u0644\u060c \u0645\u0627 commit \u0647\u0627\u06cc\u06cc \u0631\u0627 \u06a9\u0647 \u062f\u0631 \u0622\u0646 \u0628\u0648\u062f\u0646\u062f \u00ab\u06a9\u067e\u06cc\u00bb \u06a9\u0631\u062f\u06cc\u0645 <code>paul_branch<\/code> \u0648 \u0628\u0639\u062f \u0627\u0632 &#8220;Commit 4&#8221; \u0645\u0639\u0631\u0641\u06cc \u0634\u062f \u0648 \u0622\u0646\u0647\u0627 \u0631\u0627 \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc \u0622\u0646 &#8220;\u0686\u0633\u0628\u0627\u0646\u062f&#8221;. <code>john_branch<\/code>.<\/p>\n<p>\u0627\u06cc\u0646 \u0641\u0631\u0645\u0627\u0646 &#8220;rebase&#8221; \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc \u0634\u0648\u062f\u060c \u0632\u06cc\u0631\u0627 commit \u067e\u0627\u06cc\u0647 \u0634\u0627\u062e\u0647 \u0627\u06cc \u0631\u0627 \u06a9\u0647 \u0627\u0632 \u0622\u0646 \u0627\u062c\u0631\u0627 \u0645\u06cc \u0634\u0648\u062f \u062a\u063a\u06cc\u06cc\u0631 \u0645\u06cc \u062f\u0647\u062f.  \u06cc\u0639\u0646\u06cc \u062f\u0631 \u0645\u0648\u0631\u062f \u0634\u0645\u0627 \u0642\u0628\u0644 \u0627\u0632 \u0627\u062c\u0631\u0627 <code>git rebase<\/code>\u060c \u067e\u0627\u06cc\u0647 \u0627\u0632 <code>paul_branch<\/code> &#8220;\u062a\u0639\u0647\u062f 4&#8221; \u0628\u0648\u062f &#8211; \u0632\u06cc\u0631\u0627 \u0627\u06cc\u0646 \u0634\u0639\u0628\u0647 &#8220;\u0645\u062a\u0648\u0644\u062f&#8221; (\u0627\u0632 <code>main<\/code>).  \u0628\u0627 <code>rebase<\/code>\u0634\u0645\u0627 \u0627\u0632 \u06af\u06cc\u062a \u062e\u0648\u0627\u0633\u062a\u06cc\u062f \u06a9\u0647 \u067e\u0627\u06cc\u06af\u0627\u0647 \u062f\u06cc\u06af\u0631\u06cc \u0628\u0647 \u0622\u0646 \u0628\u062f\u0647\u062f \u2013 \u06cc\u0639\u0646\u06cc \u0637\u0648\u0631\u06cc \u0648\u0627\u0646\u0645\u0648\u062f \u06a9\u0646\u06cc\u062f \u06a9\u0647 \u06af\u0648\u06cc\u06cc \u0627\u0632 \u00abCommit 6\u00bb \u0645\u062a\u0648\u0644\u062f \u0634\u062f\u0647 \u0627\u0633\u062a.<\/p>\n<p>\u0628\u0631\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0627\u06cc\u0646 \u06a9\u0627\u0631\u060c Git \u0622\u0646\u0686\u0647 \u0642\u0628\u0644\u0627\u064b &#8220;Commit 7&#8221; \u0628\u0648\u062f \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f \u0648 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u062f\u0631 \u0627\u06cc\u0646 commit \u0631\u0627 \u0631\u0648\u06cc &#8220;Commit 6&#8221; &#8220;\u0628\u0627\u0632\u067e\u062e\u0634&#8221; \u06a9\u0631\u062f \u0648 \u0633\u067e\u0633 \u06cc\u06a9 \u0634\u06cc commit \u062c\u062f\u06cc\u062f \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f.  \u0627\u06cc\u0646 \u0634\u06cc \u0627\u0632 \u0633\u0647 \u062c\u0646\u0628\u0647 \u0628\u0627 &#8220;Commit 7&#8221; \u0627\u0635\u0644\u06cc \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a:<\/p>\n<ol>\n<li>\u0645\u0647\u0631 \u0632\u0645\u0627\u0646\u06cc \u0645\u062a\u0641\u0627\u0648\u062a\u06cc \u062f\u0627\u0631\u062f.<\/li>\n<li>\u0627\u06cc\u0646 \u06cc\u06a9 \u062a\u0639\u0647\u062f \u0648\u0627\u0644\u062f\u06cc\u0646 \u0645\u062a\u0641\u0627\u0648\u062a \u062f\u0627\u0631\u062f &#8211; &#8220;Commit 6&#8221; \u0628\u0647 \u062c\u0627\u06cc &#8220;Commit 4&#8221;.<\/li>\n<li>\u0634\u06cc \u062f\u0631\u062e\u062a\u06cc \u06a9\u0647 \u0628\u0647 \u0622\u0646 \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a &#8211; \u0632\u06cc\u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u062f\u0631 \u062f\u0631\u062e\u062a\u06cc \u06a9\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 6&#8221; \u0628\u0647 \u0622\u0646 \u0627\u0634\u0627\u0631\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u0648 \u0646\u0647 \u062f\u0631\u062e\u062a\u06cc \u06a9\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 4&#8221; \u0628\u0647 \u0622\u0646 \u0627\u0634\u0627\u0631\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u0627\u0631\u0627\u0626\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a.<\/li>\n<\/ol>\n<p>\u0628\u0647 \u0622\u062e\u0631\u06cc\u0646 commit \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627\u060c &#8220;Commit 9&#8221; \u062a\u0648\u062c\u0647 \u06a9\u0646\u06cc\u062f.  \u0639\u06a9\u0633 \u0641\u0648\u0631\u06cc \u06a9\u0647 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u06cc\u0639\u0646\u06cc \u062f\u0631\u062e\u062a\u06cc \u06a9\u0647 \u0628\u0647 \u0622\u0646 \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f) \u062f\u0642\u06cc\u0642\u0627\u064b \u0647\u0645\u0627\u0646 \u062f\u0631\u062e\u062a\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0628\u0627 \u0627\u062f\u063a\u0627\u0645 \u062f\u0648 \u0634\u0627\u062e\u0647 \u0628\u0647 \u062f\u0633\u062a \u0645\u06cc \u0622\u0648\u0631\u06cc\u062f.  \u0648\u0636\u0639\u06cc\u062a \u0641\u0627\u06cc\u0644 \u0647\u0627 \u062f\u0631 \u0645\u062e\u0632\u0646 Git \u0634\u0645\u0627 \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f <strong>\u0647\u0645\u0627\u0646<\/strong> \u0645\u062b\u0644 \u0627\u06cc\u0646\u06a9\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u06cc <code>git merge<\/code>.  \u0627\u06cc\u0646 \u0641\u0642\u0637 \u062a\u0627\u0631\u06cc\u062e \u0627\u0633\u062a \u06a9\u0647 \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a\u060c \u0648 \u0627\u0644\u0628\u062a\u0647 \u0645\u0648\u0627\u0631\u062f commit.<\/p>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0647 \u0633\u0627\u062f\u06af\u06cc \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git checkout main\ngit merge paul_branch<\/code><\/pre>\n<p>\u0647\u0648\u0645 &#8230;. \u0627\u06af\u0631 \u0627\u06cc\u0646 \u0622\u062e\u0631\u06cc\u0646 \u062f\u0633\u062a\u0648\u0631 \u0631\u0627 \u0627\u062c\u0631\u0627 \u0645\u06cc \u06a9\u0631\u062f\u06cc\u062f \u0686\u0647 \u0627\u062a\u0641\u0627\u0642\u06cc \u0645\u06cc \u0627\u0641\u062a\u0627\u062f\u061f  \ud83e\udd14 \u067e\u0633 \u0627\u0632 \u0628\u0631\u0631\u0633\u06cc \u0645\u062c\u062f\u062f\u060c \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0627\u0631\u062a\u06a9\u0627\u0628 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f <code>main<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-210.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-210\" width=\"2352\" height=\"820\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 rebasing \u0648 \u0628\u0631\u0631\u0633\u06cc <code>main<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u062f\u063a\u0627\u0645 \u0628\u0647 \u0686\u0647 \u0645\u0639\u0646\u0627\u0633\u062a <code>main<\/code> \u0648 <code>paul_branch<\/code>?<\/p>\n<p>\u062f\u0631 \u0648\u0627\u0642\u0639\u060c Git \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0628\u0647 \u0633\u0627\u062f\u06af\u06cc \u06cc\u06a9 \u0627\u062f\u063a\u0627\u0645 \u0633\u0631\u06cc\u0639 \u0628\u0647 \u062c\u0644\u0648 \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u062f\u060c \u0632\u06cc\u0631\u0627 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u06a9\u0627\u0645\u0644\u0627\u064b \u062e\u0637\u06cc \u0627\u0633\u062a (\u0627\u06af\u0631 \u0628\u0647 \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc \u062f\u0631 \u0645\u0648\u0631\u062f \u0627\u062f\u063a\u0627\u0645 \u0633\u0631\u06cc\u0639 \u0628\u0647 \u062c\u0644\u0648 \u0646\u06cc\u0627\u0632 \u062f\u0627\u0631\u06cc\u062f\u060c \u0627\u06cc\u0646 \u067e\u0633\u062a \u0631\u0627 \u0628\u0631\u0631\u0633\u06cc \u06a9\u0646\u06cc\u062f).  \u062f\u0631 \u0646\u062a\u06cc\u062c\u0647\u060c <code>main<\/code> \u0648 <code>paul_branch<\/code> \u062d\u0627\u0644\u0627 \u0628\u0647 \u0647\u0645\u0627\u0646 commit \u0627\u0634\u0627\u0631\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-211.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-211\" width=\"1168\" height=\"619\" loading=\"lazy\" title=\"\"><figcaption>\u0646\u062a\u06cc\u062c\u0647 \u06cc\u06a9 \u0627\u062f\u063a\u0627\u0645 \u0633\u0631\u06cc\u0639 \u0628\u0647 \u062c\u0644\u0648 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<h1 id=\"advanced-rebasing-in-git-\"><span class=\"ez-toc-section\" id=\"rebasing_%d9%be%db%8c%d8%b4%d8%b1%d9%81%d8%aa%d9%87_%d8%af%d8%b1_git%f0%9f%92%aa%f0%9f%8f%bb\"><\/span>Rebasing \u067e\u06cc\u0634\u0631\u0641\u062a\u0647 \u062f\u0631 Git\ud83d\udcaa\ud83c\udffb<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u06a9\u0647 \u0627\u0635\u0648\u0644 rebase \u0631\u0627 \u062f\u0631\u06a9 \u06a9\u0631\u062f\u06cc\u062f\u060c \u0632\u0645\u0627\u0646 \u0622\u0646 \u0641\u0631\u0627 \u0631\u0633\u06cc\u062f\u0647 \u0627\u0633\u062a \u06a9\u0647 \u0645\u0648\u0627\u0631\u062f \u067e\u06cc\u0634\u0631\u0641\u062a\u0647 \u062a\u0631\u06cc \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f\u060c \u062c\u0627\u06cc\u06cc \u06a9\u0647 \u0633\u0648\u0626\u06cc\u0686 \u0647\u0627 \u0648 \u0622\u0631\u06af\u0648\u0645\u0627\u0646 \u0647\u0627\u06cc \u0627\u0636\u0627\u0641\u06cc \u0628\u0631\u0627\u06cc <code>rebase<\/code> \u062f\u0633\u062a\u0648\u0631 \u0628\u0647 \u06a9\u0627\u0631 \u062e\u0648\u0627\u0647\u062f \u0622\u0645\u062f.<\/p>\n<p>\u062f\u0631 \u0645\u062b\u0627\u0644 \u0642\u0628\u0644 \u0648\u0642\u062a\u06cc \u0641\u0642\u0637 \u06af\u0641\u062a\u06cc\u062f <code>rebase<\/code> (\u0628\u062f\u0648\u0646 \u0633\u0648\u0626\u06cc\u0686 \u0647\u0627\u06cc \u0627\u0636\u0627\u0641\u06cc)\u060c Git \u062a\u0645\u0627\u0645 commit \u0647\u0627 \u0631\u0627 \u0627\u0632 \u062c\u062f \u0645\u0634\u062a\u0631\u06a9 \u062a\u0627 \u0646\u0648\u06a9 \u0634\u0627\u062e\u0647 \u0641\u0639\u0644\u06cc \u062f\u0648\u0628\u0627\u0631\u0647 \u067e\u062e\u0634 \u06a9\u0631\u062f.<\/p>\n<p>\u0627\u0645\u0627 rebase \u06cc\u06a9 \u0642\u062f\u0631\u062a \u0641\u0648\u0642 \u0627\u0644\u0639\u0627\u062f\u0647 \u0627\u0633\u062a\u060c \u0627\u06cc\u0646 \u06cc\u06a9 \u0641\u0631\u0645\u0627\u0646 \u0642\u0627\u062f\u0631 \u0645\u0637\u0644\u0642 \u0627\u0633\u062a \u06a9\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u062f &#8230; \u062e\u0648\u0628\u060c \u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc \u06a9\u0646\u062f.  \u0648 \u0627\u06af\u0631 \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u06cc\u062f \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u0628\u0631\u0627\u06cc \u062e\u0648\u062f \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u06cc\u062f\u060c \u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u062f \u0645\u0641\u06cc\u062f \u0628\u0627\u0634\u062f.<\/p>\n<p>\u0622\u062e\u0631\u06cc\u0646 \u0627\u062f\u063a\u0627\u0645 \u0631\u0627 \u0628\u0627 \u0627\u06cc\u062c\u0627\u062f \u062e\u0646\u062b\u06cc \u06a9\u0646\u06cc\u062f <code>main<\/code> \u062f\u0648\u0628\u0627\u0631\u0647 \u0628\u0647 &#8220;Commit 4&#8221; \u0627\u0634\u0627\u0631\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git reset -\u2013hard &lt;ORIGINAL_COMMIT 4&gt;<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-238.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-238\" width=\"590\" height=\"322\" loading=\"lazy\" title=\"\"><figcaption>&#8220;\u0648\u0627\u06af\u0631\u062f&#8221; \u0622\u062e\u0631\u06cc\u0646 \u0639\u0645\u0644\u06cc\u0627\u062a \u0627\u062f\u063a\u0627\u0645 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632:<\/p>\n<pre><code>git checkout paul_branch\ngit reset -\u2013hard &lt;ORIGINAL_COMMIT 9&gt;<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-239.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-239\" width=\"694\" height=\"367\" loading=\"lazy\" title=\"\"><figcaption>&#8220;\u0644\u063a\u0648&#8221; \u0639\u0645\u0644\u06cc\u0627\u062a rebase (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u062f\u0642\u06cc\u0642\u0627\u064b \u0628\u0647 \u0647\u0645\u0627\u0646 \u0633\u0627\u0628\u0642\u0647 \u0642\u0628\u0644\u06cc \u0631\u0633\u06cc\u062f\u0647 \u0627\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-240.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-240\" width=\"2323\" height=\"659\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u062c\u0633\u0645 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 &#8220;\u0644\u063a\u0648&#8221; \u0639\u0645\u0644\u06cc\u0627\u062a rebase (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u0627\u0632 \u0647\u0645\u060c \u0628\u0631\u0627\u06cc \u0631\u0648\u0634\u0646 \u0634\u062f\u0646\u060c &#8220;Commit 9&#8221; \u0641\u0642\u0637 \u0632\u0645\u0627\u0646\u06cc \u06a9\u0647 \u0627\u0632 \u062c\u0631\u06cc\u0627\u0646 \u0641\u0639\u0644\u06cc \u0642\u0627\u0628\u0644 \u062f\u0633\u062a\u0631\u0633\u06cc \u0646\u0628\u0627\u0634\u062f \u0646\u0627\u067e\u062f\u06cc\u062f \u0646\u0645\u06cc \u0634\u0648\u062f. <code>HEAD<\/code>.  \u0628\u0644\u06a9\u0647 \u0647\u0646\u0648\u0632 \u062f\u0631 \u067e\u0627\u06cc\u06af\u0627\u0647 \u062f\u0627\u062f\u0647 \u0634\u06cc \u0630\u062e\u06cc\u0631\u0647 \u0645\u06cc \u0634\u0648\u062f.  \u0648 \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0634\u0645\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u06cc\u062f <code>git reset<\/code> \u0627\u06a9\u0646\u0648\u0646 \u0628\u0631\u0627\u06cc \u062a\u063a\u06cc\u06cc\u0631 <code>HEAD<\/code> \u0628\u0631\u0627\u06cc \u0627\u0634\u0627\u0631\u0647 \u0628\u0647 \u0627\u06cc\u0646 commit\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0622\u0646 \u0631\u0627 \u0628\u0627\u0632\u06cc\u0627\u0628\u06cc \u06a9\u0646\u06cc\u062f\u060c \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u0648\u0627\u0644\u062f \u0622\u0646 \u0646\u06cc\u0632 \u0627\u0632 \u0622\u0646\u062c\u0627\u06cc\u06cc \u06a9\u0647 \u0622\u0646\u0647\u0627 \u062f\u0631 \u067e\u0627\u06cc\u06af\u0627\u0647 \u062f\u0627\u062f\u0647 \u0630\u062e\u06cc\u0631\u0647 \u0645\u06cc \u0634\u0648\u0646\u062f\u060c \u0645\u062a\u0639\u0647\u062f \u0645\u06cc \u0634\u0648\u0646\u062f.  \u062e\u06cc\u0644\u06cc \u0628\u0627\u062d\u0627\u0644\u0647\u060c \u0646\u0647\u061f  \ud83d\ude0e<\/p>\n<p>\u062e\u0648\u0628\u060c \u0628\u0647 \u0633\u0631\u0639\u062a \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u0631\u0627 \u06a9\u0647 \u067e\u0644 \u0645\u0639\u0631\u0641\u06cc \u06a9\u0631\u062f \u0645\u0634\u0627\u0647\u062f\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git show HEAD<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-241.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-241\" width=\"814\" height=\"658\" loading=\"lazy\" title=\"\"><figcaption><code>git show HEAD<\/code>  \u067e\u0686 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 9&#8221; \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0631 \u0646\u0645\u0648\u062f\u0627\u0631 commit \u0628\u0647 \u0639\u0642\u0628 \u0627\u062f\u0627\u0645\u0647 \u062f\u0647\u06cc\u062f:<\/p>\n<pre><code>git show HEAD~<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-242.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-242\" width=\"589\" height=\"723\" loading=\"lazy\" title=\"\"><figcaption><code>git show HEAD~<\/code>  (\u0645\u062b\u0644 <code>git show HEAD~1<\/code>) \u067e\u0686 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 8&#8221; \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u06cc\u06a9 \u0627\u0631\u062a\u06a9\u0627\u0628 \u0628\u06cc\u0634\u062a\u0631:<\/p>\n<pre><code>git show HEAD~2<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-243.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-243\" width=\"636\" height=\"663\" loading=\"lazy\" title=\"\"><figcaption><code>git show HEAD~2<\/code>  \u067e\u0686 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 &#8220;Commit 7&#8221; \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u0627\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u062e\u0648\u0628 \u0647\u0633\u062a\u0646\u062f\u060c \u0627\u0645\u0627 \u0634\u0627\u06cc\u062f \u067e\u0644 \u0627\u06cc\u0646 \u0646\u0648\u0639 \u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u0646\u0645\u06cc \u062e\u0648\u0627\u0647\u062f.  \u0628\u0644\u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u062f \u0637\u0648\u0631\u06cc \u0628\u0647 \u0646\u0638\u0631 \u0628\u0631\u0633\u062f \u06a9\u0647 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u00abCommit 7\u00bb \u0648 \u00abCommit 8\u00bb \u0631\u0627 \u0628\u0647 \u0635\u0648\u0631\u062a \u062a\u06a9 \u06a9\u0627\u0645\u06cc\u062a \u0645\u0639\u0631\u0641\u06cc \u06a9\u0631\u062f\u0647 \u0627\u0633\u062a.<\/p>\n<p>\u0628\u0631\u0627\u06cc \u0622\u0646\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0632 \u06cc\u06a9 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <strong>\u062f\u0631 \u0627\u0631\u062a\u0628\u0627\u0637 \u0628\u0648\u062f\u0646<\/strong> \u062a\u063a\u06cc\u06cc\u0631 \u067e\u0627\u06cc\u0647  \u0628\u0631\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0627\u06cc\u0646 \u06a9\u0627\u0631\u060c \u0645\u0627 \u0631\u0627 \u0627\u0636\u0627\u0641\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u0645 <code>-i<\/code> (\u06cc\u0627 <code>--interactive<\/code>) \u0628\u0647 <code>rebase<\/code> \u062f\u0633\u062a\u0648\u0631:<\/p>\n<pre><code>git rebase -i &lt;SHA_OF_COMMIT_4&gt;<\/code><\/pre>\n<p>\u06cc\u0627\u060c \u0627\u0632 \u0622\u0646 \u0632\u0645\u0627\u0646 <code>main<\/code> \u0628\u0647 &#8220;Commit 4&#8221; \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f\u060c \u0645\u0627 \u0628\u0647 \u0633\u0627\u062f\u06af\u06cc \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u0645:<\/p>\n<pre><code>git rebase -i main<\/code><\/pre>\n<p>\u0628\u0627 \u0627\u062c\u0631\u0627\u06cc \u0627\u06cc\u0646 \u062f\u0633\u062a\u0648\u0631\u060c \u0628\u0647 Git \u0645\u06cc\u200c\u06af\u0648\u06cc\u06cc\u062f \u06a9\u0647 \u0627\u0632 \u06cc\u06a9 \u067e\u0627\u06cc\u0647 \u062c\u062f\u06cc\u062f\u060c &#8220;Commit 4&#8221; \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u062f.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0634\u0645\u0627 \u0627\u0632 Git \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0647 \u0628\u0647 \u062a\u0645\u0627\u0645 commit\u200c\u0647\u0627\u06cc\u06cc \u06a9\u0647 \u067e\u0633 \u0627\u0632 \u00abCommit 4\u00bb \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647\u200c\u0627\u0646\u062f \u0648 \u0627\u0632 \u0632\u0645\u0627\u0646 \u06a9\u0646\u0648\u0646\u06cc \u0642\u0627\u0628\u0644 \u062f\u0633\u062a\u0631\u0633\u06cc \u0647\u0633\u062a\u0646\u062f \u0628\u0627\u0632\u06af\u0631\u062f\u062f. <code>HEAD<\/code>\u0648 \u0622\u0646 \u062a\u0639\u0647\u062f\u0627\u062a \u0631\u0627 \u062f\u0648\u0628\u0627\u0631\u0647 \u067e\u062e\u0634 \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0628\u0631\u0627\u06cc \u0647\u0631 commit \u06a9\u0647 \u062f\u0648\u0628\u0627\u0631\u0647 \u067e\u062e\u0634 \u0645\u06cc \u0634\u0648\u062f\u060c Git \u0627\u0632 \u0645\u0627 \u0645\u06cc \u067e\u0631\u0633\u062f \u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u0645 \u0628\u0627 \u0622\u0646 \u0686\u0647 \u06a9\u0627\u0631 \u06a9\u0646\u06cc\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-250.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-250\" width=\"994\" height=\"738\" loading=\"lazy\" title=\"\"><figcaption><code>git rebase -i main<\/code>  \u0627\u0632 \u0634\u0645\u0627 \u0645\u06cc \u062e\u0648\u0627\u0647\u062f \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f \u06a9\u0647 \u0628\u0627 \u0647\u0631 commit \u0686\u0647 \u06a9\u0627\u0631\u06cc \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0631 \u0627\u06cc\u0646 \u0632\u0645\u06cc\u0646\u0647 \u0645\u0641\u06cc\u062f \u0627\u0633\u062a \u06a9\u0647 \u06cc\u06a9 commit \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u06a9 \u067e\u0686 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u0645.  \u06cc\u0639\u0646\u06cc \u00abCommit 7\u00bb \u0645\u0627\u0646\u0646\u062f \u00ab\u0648\u0635\u0644\u0647\u200c\u0627\u06cc \u06a9\u0647 \u00abCommit 7\u00bb \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc \u0648\u0627\u0644\u062f \u062e\u0648\u062f \u0645\u0639\u0631\u0641\u06cc \u06a9\u0631\u062f\u00bb.<\/p>\n<p>\u06cc\u06a9\u06cc \u0627\u0632 \u06af\u0632\u06cc\u0646\u0647 \u0647\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0633\u062a <code>pick<\/code>.  \u0627\u06cc\u0646 \u0631\u0641\u062a\u0627\u0631 \u067e\u06cc\u0634\u200c\u0641\u0631\u0636 \u0627\u0633\u062a \u06a9\u0647 \u0628\u0647 Git \u0645\u06cc\u200c\u06af\u0648\u06cc\u062f \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u062f\u0631 \u0627\u06cc\u0646 commit \u0631\u0627 \u062f\u0648\u0628\u0627\u0631\u0647 \u067e\u062e\u0634 \u06a9\u0646\u062f.  \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f\u060c \u0627\u06af\u0631 \u0622\u0646 \u0631\u0627 \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0647\u0633\u062a \u0631\u0647\u0627 \u06a9\u0646\u06cc\u062f &#8211; \u0648 <code>pick<\/code> \u0647\u0645\u0647 commit \u0647\u0627 &#8211; \u0634\u0645\u0627 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u06cc\u06a9\u0633\u0627\u0646\u06cc \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f \u0648 Git \u062d\u062a\u06cc \u0627\u0634\u06cc\u0627\u0621 commit \u062c\u062f\u06cc\u062f\u06cc \u0627\u06cc\u062c\u0627\u062f \u0646\u0645\u06cc \u06a9\u0646\u062f.<\/p>\n<p>\u06af\u0632\u06cc\u0646\u0647 \u062f\u06cc\u06af\u0631 \u0627\u06cc\u0646 \u0627\u0633\u062a <code>squash<\/code>.  \u0622 <em>\u0644\u0647 \u0634\u062f\u0647<\/em> commit \u0645\u062d\u062a\u0648\u06cc\u0627\u062a \u0622\u0646 \u062f\u0631 \u0645\u062d\u062a\u0648\u06cc\u0627\u062a commit \u0642\u0628\u0644 \u0627\u0632 \u0622\u0646 &#8220;\u062a\u0627&#8221; \u0645\u06cc \u0634\u0648\u062f.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0631 \u0645\u0648\u0631\u062f \u0645\u0627\u060c \u067e\u0644 \u0645\u0627\u06cc\u0644 \u0627\u0633\u062a &#8220;\u062a\u0639\u0647\u062f 8&#8221; \u0631\u0627 \u0628\u0647 &#8220;\u062a\u0639\u0647\u062f 7&#8221; \u062a\u0628\u062f\u06cc\u0644 \u06a9\u0646\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-251.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-251\" width=\"1020\" height=\"641\" loading=\"lazy\" title=\"\"><figcaption>\u0644\u0647 \u06a9\u0631\u062f\u0646 &#8220;Commit 8&#8221; \u0628\u0647 &#8220;Commit 7&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0645\u06cc \u0628\u06cc\u0646\u06cc\u062f\u060c <code>git rebase -i<\/code> \u06af\u0632\u06cc\u0646\u0647 \u0647\u0627\u06cc \u0627\u0636\u0627\u0641\u06cc \u0631\u0627 \u0627\u0631\u0627\u0626\u0647 \u0645\u06cc \u062f\u0647\u062f\u060c \u0627\u0645\u0627 \u0645\u0627 \u062f\u0631 \u0627\u06cc\u0646 \u067e\u0633\u062a \u0628\u0647 \u0647\u0645\u0647 \u0622\u0646\u0647\u0627 \u0646\u0645\u06cc \u067e\u0631\u062f\u0627\u0632\u06cc\u0645.  \u0627\u06af\u0631 \u0627\u062c\u0627\u0632\u0647 \u062f\u0647\u06cc\u062f rebase \u0627\u062c\u0631\u0627 \u0634\u0648\u062f\u060c \u0627\u0632 \u0634\u0645\u0627 \u062e\u0648\u0627\u0633\u062a\u0647 \u0645\u06cc \u0634\u0648\u062f \u06a9\u0647 \u06cc\u06a9 \u067e\u06cc\u0627\u0645 commit \u0631\u0627 \u0628\u0631\u0627\u06cc commit \u062a\u0627\u0632\u0647 \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f (\u06cc\u0639\u0646\u06cc \u067e\u06cc\u0627\u0645\u06cc \u06a9\u0647 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a &#8220;Commit 7&#8221; \u0648 &#8220;Commit 8&#8221; \u0631\u0627 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u0647 \u0627\u0633\u062a):<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-252.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-252\" width=\"1004\" height=\"680\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0631\u0627\u0626\u0647 \u067e\u06cc\u0627\u0645 commit: <code>Commits 7+8<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u0628\u0647 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0646\u06af\u0627\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-253.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-253\" width=\"556\" height=\"268\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 rebase \u062a\u0639\u0627\u0645\u0644\u06cc (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0642\u06cc\u0642\u0627 \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0645\u0627 \u0645\u06cc \u062e\u0648\u0627\u0633\u062a\u06cc\u0645!  \u062f\u0627\u0631\u06cc\u0645 <code>paul_branch<\/code> &#8220;Commit 9&#8221; (\u0627\u0644\u0628\u062a\u0647\u060c \u0627\u06cc\u0646 \u06cc\u06a9 \u0634\u06cc \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0632 &#8220;Commit 9&#8221; \u0627\u0635\u0644\u06cc \u0627\u0633\u062a).  \u0627\u06cc\u0646 \u0628\u0647 &#8220;Commits 7+8&#8221; \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f\u060c \u06a9\u0647 \u06cc\u06a9 commit \u0648\u0627\u062d\u062f \u0627\u0633\u062a \u06a9\u0647 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a &#8220;Commit 7&#8221; \u0648 &#8220;Commit 8&#8221; \u0627\u0635\u0644\u06cc \u0631\u0627 \u0645\u0639\u0631\u0641\u06cc \u0645\u06cc \u06a9\u0646\u062f.  \u0648\u0627\u0644\u062f \u0627\u06cc\u0646 commit &#8220;Commit 4&#8221; \u0627\u0633\u062a\u060c \u06a9\u0647 \u062f\u0631 \u0622\u0646 <code>main<\/code> \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f \u0628\u0647  \u0634\u0645\u0627 \u062f\u0627\u0631\u06cc\u062f <code>john_branch<\/code>.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-254.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-254\" width=\"2219\" height=\"615\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 \u062a\u063a\u06cc\u06cc\u0631 \u0645\u062c\u062f\u062f \u062a\u0639\u0627\u0645\u0644\u06cc &#8211; \u062a\u062c\u0633\u0645 \u0634\u062f\u0647 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u0648\u0647 \u0648\u0627\u06cc\u060c \u0627\u06cc\u0646 \u0628\u0627\u062d\u0627\u0644 \u0646\u06cc\u0633\u062a\u061f  \ud83d\ude0e<\/p>\n<p><code>git rebase<\/code>  \u0628\u0647 \u0634\u0645\u0627 \u06a9\u0646\u062a\u0631\u0644 \u0646\u0627\u0645\u062d\u062f\u0648\u062f\u06cc \u0628\u0631 \u0634\u06a9\u0644 \u0647\u0631 \u0634\u0627\u062e\u0647 \u0645\u06cc \u062f\u0647\u062f.  \u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0632 \u0622\u0646 \u0628\u0631\u0627\u06cc \u062a\u0631\u062a\u06cc\u0628 \u062f\u0627\u062f\u0646 \u0645\u062c\u062f\u062f \u062a\u0639\u0647\u062f\u0627\u062a \u06cc\u0627 \u062d\u0630\u0641 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0646\u0627\u062f\u0631\u0633\u062a \u06cc\u0627 \u0627\u0635\u0644\u0627\u062d \u06cc\u06a9 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0631 \u0646\u06af\u0627\u0647 \u0628\u0647 \u06af\u0630\u0634\u062a\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f.  \u0627\u0632 \u0637\u0631\u0641 \u062f\u06cc\u06af\u0631\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u067e\u0627\u06cc\u0647 \u0634\u0627\u062e\u0647 \u062e\u0648\u062f \u0631\u0627 \u0628\u0647 commit \u062f\u06cc\u06af\u0631\u06cc \u0645\u0646\u062a\u0642\u0644 \u06a9\u0646\u06cc\u062f\u060c \u0647\u0631 commit\u06cc \u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f.<\/p>\n<h2 id=\"how-to-use-the-onto-switch-of-git-rebase\"><span class=\"ez-toc-section\" id=\"%d9%86%d8%ad%d9%88%d9%87_%d8%a7%d8%b3%d8%aa%d9%81%d8%a7%d8%af%d9%87_%d8%a7%d8%b2_-onto_%d8%b3%d9%88%d8%a6%db%8c%da%86_%d8%a7%d8%b2_git_rebase\"><\/span>\u0646\u062d\u0648\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>--onto<\/code> \u0633\u0648\u0626\u06cc\u0686 \u0627\u0632 <code>git rebase<\/code><span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>\u0628\u06cc\u0627\u06cc\u06cc\u062f \u06cc\u06a9 \u0645\u062b\u0627\u0644 \u062f\u06cc\u06af\u0631 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u0645.  \u0628\u0647 <code>main<\/code> \u0627\u0632 \u0646\u0648:<\/p>\n<pre><code>git checkout main<\/code><\/pre>\n<p>\u0648 \u0646\u0634\u0627\u0646\u06af\u0631\u0647\u0627 \u0631\u0627 \u062d\u0630\u0641 \u06a9\u0646\u06cc\u062f <code>paul_branch<\/code> \u0648 <code>john_branch<\/code> \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u06cc\u06af\u0631 \u0622\u0646\u0647\u0627 \u0631\u0627 \u062f\u0631 \u0646\u0645\u0648\u062f\u0627\u0631 commit \u0646\u0645\u06cc \u0628\u06cc\u0646\u06cc\u062f:<\/p>\n<pre><code>git branch -D paul_branch\ngit branch -D john_branch<\/code><\/pre>\n<p>\u0648 \u062d\u0627\u0644\u0627 \u0645\u0646\u0634\u0639\u0628 \u0627\u0632 <code>main<\/code> \u0628\u0647 \u0634\u0639\u0628\u0647 \u062c\u062f\u06cc\u062f:<\/p>\n<pre><code>git checkout -b new_branch<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-255.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-255\" width=\"634\" height=\"202\" loading=\"lazy\" title=\"\"><figcaption>\u067e\u062f\u06cc\u062f \u0622\u0648\u0631\u062f\u0646 <code>new_branch<\/code> \u06a9\u0647 \u0627\u0632 <code>main<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-256.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-256\" width=\"1601\" height=\"814\" loading=\"lazy\" title=\"\"><figcaption>\u06cc\u06a9 \u062a\u0627\u0631\u06cc\u062e \u067e\u0627\u06a9 \u0628\u0627 <code>new_branch<\/code> \u06a9\u0647 \u0627\u0632 <code>main<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u06a9\u0646\u0648\u0646\u060c \u0686\u0646\u062f \u062a\u063a\u06cc\u06cc\u0631 \u0631\u0627 \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f \u0648 \u0622\u0646\u0647\u0627 \u0631\u0627 \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f:<\/p>\n<pre><code>nano code.py<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-257.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-257\" width=\"588\" height=\"328\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0627\u0628\u0639 <code>new_branch<\/code> \u0628\u0647 <code>code.py<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<pre><code>git add code.py\ngit commit -m \"Commit 10\"<\/code><\/pre>\n<p>\u0628\u0631\u06af\u0634\u062a\u0646 \u0628\u0647 <code>main<\/code>:<\/p>\n<pre><code>git checkout main<\/code><\/pre>\n<p>\u0648 \u06cc\u06a9 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u06cc\u06af\u0631 \u0645\u0639\u0631\u0641\u06cc \u06a9\u0646\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-258.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-258\" width=\"588\" height=\"331\" loading=\"lazy\" title=\"\"><figcaption>\u06cc\u06a9 docstring \u062f\u0631 \u0627\u0628\u062a\u062f\u0627\u06cc \u0641\u0627\u06cc\u0644 \u0627\u0636\u0627\u0641\u0647 \u0634\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0632\u0645\u0627\u0646 \u0628\u0631\u0627\u06cc \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc \u0648 \u0627\u0646\u062c\u0627\u0645 \u0627\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a:<\/p>\n<pre><code>git add code.py\ngit commit -m \"Commit 11\"<\/code><\/pre>\n<p>\u0648 \u06cc\u06a9 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u06cc\u06af\u0631:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-259.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-259\" width=\"587\" height=\"380\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0636\u0627\u0641\u0647 <code>@Author<\/code> to the docstring (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0631\u0627 \u0646\u06cc\u0632 \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f:<\/p>\n<pre><code>git add code.py\ngit commit -m \"Commit 12\"<\/code><\/pre>\n<p>\u0627\u0648\u0647 \u0635\u0628\u0631 \u06a9\u0646\u06cc\u062f\u060c \u0627\u06a9\u0646\u0648\u0646 \u0645\u062a\u0648\u062c\u0647 \u0634\u062f\u0645 \u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0633\u062a\u0645 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u0631\u0627 \u06a9\u0647 \u062f\u0631 &#8220;Commit 11&#8221; \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0628\u062e\u0634\u06cc \u0627\u0632 <code>new_branch<\/code>.  \u0627\u0648\u0647  \u0686\u0647 \u06a9\u0627\u0631\u06cc \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc \u0627\u0646\u062c\u0627\u0645 \u0628\u062f\u0647\u06cc\u061f  \ud83e\udd14<\/p>\n<p>\u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-260.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-260\" width=\"1613\" height=\"798\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 \u0645\u0639\u0631\u0641\u06cc &#8220;Commit 12&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0686\u06cc\u0632\u06cc \u06a9\u0647 \u0645\u0646 \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u0645 \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0628\u0647 \u062c\u0627\u06cc \u0627\u06cc\u0646\u06a9\u0647 &#8220;Commit 10&#8221; \u0641\u0642\u0637 \u0631\u0648\u06cc \u0622\u0646 \u0628\u0627\u0634\u062f <code>main<\/code> \u0634\u0627\u062e\u0647\u060c \u0645\u0646 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 \u0622\u0646 \u0631\u0627 \u062f\u0631 \u0647\u0631 \u062f\u0648 \u0628\u0627\u0634\u062f <code>main<\/code> \u0634\u0639\u0628\u0647 \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 <code>new_branch<\/code>.  \u0627\u0632 \u0646\u0638\u0631 \u0628\u0635\u0631\u06cc\u060c \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u0645 \u0622\u0646 \u0631\u0627 \u062f\u0631 \u0646\u0645\u0648\u062f\u0627\u0631 \u0628\u0647 \u067e\u0627\u06cc\u06cc\u0646 \u0645\u0646\u062a\u0642\u0644 \u06a9\u0646\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-261.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-261\" width=\"1578\" height=\"559\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0632 \u0646\u0638\u0631 \u0628\u0635\u0631\u06cc\u060c \u0627\u0632 \u0634\u0645\u0627 \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u0645 \u06a9\u0647 &#8220;Commit 10&#8221; \u0631\u0627 &#8220;\u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0645\u06cc\u062a\u0648\u0646\u06cc \u0628\u0628\u06cc\u0646\u06cc \u06a9\u062c\u0627 \u062f\u0627\u0631\u0645 \u0645\u06cc\u0631\u0645\u061f  \ud83d\ude07<\/p>\n<p>\u062e\u0648\u0628\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0641\u0647\u0645\u06cc\u062f\u06cc\u0645\u060c rebase \u0627\u0633\u0627\u0633\u0627\u064b \u0628\u0647 \u0645\u0627 \u0627\u062c\u0627\u0632\u0647 \u0645\u06cc \u062f\u0647\u062f <em>\u0628\u0627\u0632\u067e\u062e\u0634<\/em> \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0648\u0627\u0631\u062f \u0634\u062f\u0647 \u062f\u0631 <code>new_branch<\/code>\u060c \u0645\u0648\u0627\u0631\u062f\u06cc \u06a9\u0647 \u062f\u0631 &#8220;\u0627\u0631\u062a\u06a9\u0627\u0628 10&#8221; \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u0627\u0646\u062f\u060c \u0628\u0647 \u06af\u0648\u0646\u0647 \u0627\u06cc \u06a9\u0647 \u06af\u0648\u06cc\u06cc \u062f\u0631 \u0627\u0628\u062a\u062f\u0627 \u0628\u0647 \u062c\u0627\u06cc &#8220;\u0627\u0631\u062a\u06a9\u0627\u0628 4&#8221; \u0628\u0631 \u0631\u0648\u06cc &#8220;\u0627\u0631\u062a\u0628\u0627\u0637 11&#8221; \u0627\u0646\u062c\u0627\u0645 \u0634\u062f\u0647 \u0627\u0646\u062f.<\/p>\n<p>\u0628\u0631\u0627\u06cc \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0632 \u0622\u0631\u06af\u0648\u0645\u0627\u0646 \u0647\u0627\u06cc \u062f\u06cc\u06af\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git rebase<\/code>.  \u0628\u0647 Git \u0645\u06cc\u200c\u06af\u0648\u06cc\u06cc\u062f \u06a9\u0647 \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u06cc\u062f \u062a\u0645\u0627\u0645 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647\u200c\u0627\u06cc \u0631\u0627 \u06a9\u0647 \u0628\u06cc\u0646 \u062c\u062f \u0645\u0634\u062a\u0631\u06a9 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u0628\u06af\u06cc\u0631\u06cc\u062f <code>main<\/code> \u0648 <code>new_branch<\/code>\u060c \u06a9\u0647 &#8220;Commit 4&#8221; \u0627\u0633\u062a \u0648 \u067e\u0627\u06cc\u06af\u0627\u0647 \u062c\u062f\u06cc\u062f \u0622\u0646 \u062a\u0627\u0631\u06cc\u062e &#8220;Commit 11&#8221; \u0627\u0633\u062a.  \u0628\u0631\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0627\u0632:<\/p>\n<pre><code>git rebase -\u2013onto &lt;SHA_OF_COMMIT_11&gt; main new_branch<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-262.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-262\" width=\"812\" height=\"565\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0642\u0628\u0644 \u0648 \u0628\u0639\u062f \u0627\u0632 rebase\u060c &#8220;Commit 10&#8221; &#8220;\u0647\u0644&#8221; \u0634\u062f\u0647 \u0627\u0633\u062a (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u0628\u0647 \u062a\u0627\u0631\u06cc\u062e \u0632\u06cc\u0628\u0627\u06cc \u0645\u0627 \u0646\u06af\u0627\u0647 \u06a9\u0646\u06cc\u062f!  \ud83d\ude0d<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-263.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-263\" width=\"1579\" height=\"552\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0642\u0628\u0644 \u0648 \u0628\u0639\u062f \u0627\u0632 rebase\u060c &#8220;Commit 10&#8221; &#8220;\u0647\u0644&#8221; \u0634\u062f\u0647 \u0627\u0633\u062a (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u06cc\u0627\u06cc\u06cc\u062f \u06cc\u06a9 \u0645\u0648\u0631\u062f \u062f\u06cc\u06af\u0631 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u0645.<\/p>\n<p>\u0628\u06af\u0648 \u0645\u0646 \u062f\u0631 \u06cc\u06a9 \u0634\u0639\u0628\u0647 \u0634\u0631\u0648\u0639 \u0628\u0647 \u06a9\u0627\u0631 \u06a9\u0631\u062f\u0645 \u0648 \u0628\u0647 \u0627\u0634\u062a\u0628\u0627\u0647 \u0627\u0632 \u0622\u0646\u062c\u0627 \u0634\u0631\u0648\u0639 \u0628\u0647 \u06a9\u0627\u0631 \u06a9\u0631\u062f\u0645 <code>feature_branch_1<\/code>\u060c \u0628\u0647 \u062c\u0627\u06cc \u0627\u0632 <code>main<\/code>.<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0628\u0631\u0627\u06cc \u062a\u0642\u0644\u06cc\u062f \u0627\u0632 \u0627\u06cc\u0646\u060c \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f <code>feature_branch_1<\/code>:<\/p>\n<pre><code>git checkout main\ngit checkout -b feature_branch_1<\/code><\/pre>\n<p>\u0648 \u067e\u0627\u06a9 \u06a9\u0646 <code>new_branch<\/code> \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u06cc\u06af\u0631 \u0622\u0646 \u0631\u0627 \u062f\u0631 \u0646\u0645\u0648\u062f\u0627\u0631 \u0646\u0645\u06cc \u0628\u06cc\u0646\u06cc\u062f:<\/p>\n<pre><code>git branch -D new_branch<\/code><\/pre>\n<p>\u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u067e\u0627\u06cc\u062a\u0648\u0646 \u0633\u0627\u062f\u0647 \u0628\u0647 \u0646\u0627\u0645 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f <code>1.py<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-264.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-264\" width=\"581\" height=\"80\" loading=\"lazy\" title=\"\"><figcaption>\u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062c\u062f\u06cc\u062f\u060c <code>1.py<\/code>\u060c \u0628\u0627 <code>print('Hello world!')<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc \u0648 commit \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git add 1.py\ngit commit -m  \"Commit 13\"<\/code><\/pre>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u0645\u0646\u0634\u0639\u0628 \u0634\u062f\u0647 (\u0628\u0647 \u0627\u0634\u062a\u0628\u0627\u0647) \u0627\u0632 <code>feature_branch_1<\/code>:<\/p>\n<pre><code>git checkout -b feature_branch_2<\/code><\/pre>\n<p>\u0648 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062f\u06cc\u06af\u0631 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f <code>2.py<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-265.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-265\" width=\"561\" height=\"90\" loading=\"lazy\" title=\"\"><figcaption>\u067e\u062f\u06cc\u062f \u0622\u0648\u0631\u062f\u0646 <code>2.py<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0646\u06cc\u0632 \u0627\u0633\u062a\u06cc\u062c \u0648 commit \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git add 2.py\ngit commit -m  \"Commit 14\"<\/code><\/pre>\n<p>\u0648 \u0686\u0646\u062f \u06a9\u062f \u062f\u06cc\u06af\u0631 \u0631\u0627 \u0645\u0639\u0631\u0641\u06cc \u06a9\u0646\u06cc\u062f <code>2.py<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-266.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-266\" width=\"995\" height=\"134\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u0627\u0635\u0644\u0627\u062d <code>2.py<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0627\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0631\u0627 \u0646\u06cc\u0632 \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc \u0648 \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f:<\/p>\n<pre><code>git add 2.py\ngit commit -m  \"Commit 15\"<\/code><\/pre>\n<p>\u062a\u0627 \u0627\u06cc\u0646\u062c\u0627 \u0634\u0645\u0627 \u0628\u0627\u06cc\u062f \u0627\u06cc\u0646 \u0633\u0627\u0628\u0642\u0647 \u0631\u0627 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-267.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-267\" width=\"2050\" height=\"572\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 \u0645\u0639\u0631\u0641\u06cc &#8220;Commit 15&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0628\u0631\u06af\u0634\u062a\u0646 \u0628\u0647 <code>feature_branch_1<\/code> \u0648 \u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0646\u06cc\u062f <code>1.py<\/code>:<\/p>\n<pre><code>git checkout feature_branch_1<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-268.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-268\" width=\"563\" height=\"84\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u0627\u0635\u0644\u0627\u062d <code>1.py<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u0645\u0631\u062d\u0644\u0647 \u0648 \u0645\u062a\u0639\u0647\u062f \u0634\u0648\u06cc\u062f:<\/p>\n<pre><code>git add 1.py\ngit commit -m  \"Commit 16\"<\/code><\/pre>\n<p>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0634\u0645\u0627 \u0628\u0627\u06cc\u062f \u0628\u0647 \u0627\u06cc\u0646 \u0635\u0648\u0631\u062a \u0628\u0627\u0634\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-270.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-270\" width=\"2080\" height=\"573\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 \u0645\u0639\u0631\u0641\u06cc &#8220;Commit 16&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0628\u06af\u0648 \u062d\u0627\u0644\u0627 \u0641\u0647\u0645\u06cc\u062f\u06cc \u0627\u0634\u062a\u0628\u0627\u0647 \u06a9\u0631\u062f\u06cc  \u062a\u0648 \u0648\u0627\u0642\u0639\u0627 \u0645\u06cc \u062e\u0648\u0627\u0633\u062a\u06cc <code>feature_branch_2<\/code> \u0628\u0647 \u062f\u0646\u06cc\u0627 \u0622\u0645\u062f\u0646 \u0627\u0632 <code>main<\/code> \u0634\u0627\u062e\u0647\u060c \u0628\u0647 \u062c\u0627\u06cc \u0627\u0632 <code>feature_branch_1<\/code>.<\/p>\n<p>\u0686\u06af\u0648\u0646\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0647 \u0622\u0646 \u062f\u0633\u062a \u067e\u06cc\u062f\u0627 \u06a9\u0646\u06cc\u062f\u061f  \ud83e\udd14<\/p>\n<p>\u0628\u0627 \u062a\u0648\u062c\u0647 \u0628\u0647 \u0646\u0645\u0648\u062f\u0627\u0631 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0648 \u0622\u0646\u0686\u0647 \u062f\u0631 \u0645\u0648\u0631\u062f \u0622\u0646 \u0622\u0645\u0648\u062e\u062a\u0647 \u0627\u06cc\u062f\u060c \u0633\u0639\u06cc \u06a9\u0646\u06cc\u062f \u062f\u0631 \u0645\u0648\u0631\u062f \u0622\u0646 \u0641\u06a9\u0631 \u06a9\u0646\u06cc\u062f <code>--onto<\/code> \u067e\u0631\u0686\u0645 \u0628\u0631\u0627\u06cc <code>rebase<\/code> \u0641\u0631\u0645\u0627\u0646<\/p>\n<p>\u062e\u0648\u0628\u060c \u0634\u0645\u0627 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f &#8220;\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646&#8221; \u0648\u0627\u0644\u062f \u0627\u0648\u0644\u06cc\u0646 commit \u062e\u0648\u062f \u0634\u0648\u06cc\u062f <code>feature_branch_2<\/code>\u060c \u06a9\u0647 &#8220;\u0645\u062a\u0639\u0647\u062f 14&#8221; \u0627\u0633\u062a\u060c \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc \u0622\u0646 \u0642\u0631\u0627\u0631 \u06af\u06cc\u0631\u062f <code>main<\/code> \u0634\u0627\u062e\u0647\u060c \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f\u060c &#8220;\u0645\u062a\u0639\u0647\u062f 12&#8243;\u060c \u0628\u0647 \u062c\u0627\u06cc \u0622\u063a\u0627\u0632 <code>feature_branch_1<\/code>\u060c \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f\u060c &#8220;\u0645\u062a\u0639\u0647\u062f 13&#8221;.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0648\u0628\u0627\u0631\u0647\u060c \u0634\u0645\u0627 \u06cc\u06a9 \u0631\u0627 \u0627\u06cc\u062c\u0627\u062f \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f <em>\u067e\u0627\u06cc\u06af\u0627\u0647 \u062c\u062f\u06cc\u062f\u060c <\/em>\u0627\u06cc\u0646 \u0628\u0627\u0631<em> <\/em>\u0628\u0631\u0627\u06cc \u0627\u0648\u0644\u06cc\u0646 \u06a9\u0627\u0645\u06cc\u062a \u062f\u0631 <code>feature_branch_2<\/code>.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-271.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-271\" width=\"2039\" height=\"570\" loading=\"lazy\" title=\"\"><figcaption>\u0634\u0645\u0627 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u062f\u0631 \u0627\u0637\u0631\u0627\u0641 &#8220;Commit 14&#8221; \u0648 &#8220;Commit 15&#8221; \u062d\u0631\u06a9\u062a \u06a9\u0646\u06cc\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0686\u06af\u0648\u0646\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f\u061f<\/p>\n<p>\u0627\u0628\u062a\u062f\u0627 \u0628\u0647 <code>feature_branch_2<\/code>:<\/p>\n<pre><code>git checkout feature_branch_2<\/code><\/pre>\n<p>\u0648 \u0627\u06a9\u0646\u0648\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<pre><code>git rebase -\u2013onto main &lt;SHA_OF_COMMIT_13&gt;<\/code><\/pre>\n<p>\u062f\u0631 \u0646\u062a\u06cc\u062c\u0647 \u0634\u0645\u0627 \u062f\u0627\u0631\u06cc\u062f <code>feature_branch_2<\/code> \u0628\u0631 \u0627\u0633\u0627\u0633 <code>main<\/code> \u0628\u0647 \u062c\u0627\u06cc <code>feature_branch_1<\/code>:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-272.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-272\" width=\"2049\" height=\"567\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0627\u0631\u062a\u06a9\u0627\u0628 \u067e\u0633 \u0627\u0632 \u0627\u0646\u062c\u0627\u0645 rebase (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631) <\/figcaption><\/figure>\n<p>\u0646\u062d\u0648 \u0627\u0632 \u062f\u0633\u062a\u0648\u0631 \u0632\u06cc\u0631 \u0627\u0633\u062a:<\/p>\n<pre><code>git rebase --onto &lt;new_parent&gt; &lt;old_parent&gt;<\/code><\/pre>\n<h2 id=\"how-to-rebase-on-a-single-branch\"><span class=\"ez-toc-section\" id=\"%da%86%da%af%d9%88%d9%86%d9%87_%d8%a8%d8%b1_%d8%b1%d9%88%db%8c_%db%8c%da%a9_%d8%b4%d8%a7%d8%ae%d9%87_%d9%88%d8%a7%d8%ad%d8%af_%d9%85%d8%ac%d8%af%d8%af%d8%a7%d9%8b_%d9%be%d8%a7%db%8c%d9%87_%da%af%d8%b0%d8%a7%d8%b1%db%8c_%da%a9%d9%86%db%8c%d9%85\"><\/span>\u0686\u06af\u0648\u0646\u0647 \u0628\u0631 \u0631\u0648\u06cc \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u0648\u0627\u062d\u062f \u0645\u062c\u062f\u062f\u0627\u064b \u067e\u0627\u06cc\u0647 \u06af\u0630\u0627\u0631\u06cc \u06a9\u0646\u06cc\u0645<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>\u0647\u0645\u0686\u0646\u06cc\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git rebase<\/code> \u062f\u0631 \u062d\u0627\u0644\u06cc \u06a9\u0647 \u0628\u0647 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u0646\u06af\u0627\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u0645.<\/p>\n<p>\u0628\u06cc\u0627\u06cc\u06cc\u062f \u0628\u0628\u06cc\u0646\u06cc\u0645 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0628\u0647 \u0645\u0646 \u06a9\u0645\u06a9 \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0628\u06af\u0648 \u0645\u0646 \u0627\u0632 \u0622\u0646 \u06a9\u0627\u0631 \u06a9\u0631\u062f\u0645 <code>feature_branch_2<\/code>\u060c \u0648 \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f <code>code.py<\/code>.  \u0645\u0646 \u0628\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0627\u062f\u0646 \u0647\u0645\u0647 \u0631\u0634\u062a\u0647\u200c\u0647\u0627 \u0628\u0647 \u062c\u0627\u06cc \u0646\u0642\u0644 \u0642\u0648\u0644\u200c\u0647\u0627\u06cc \u062a\u06a9\u06cc\u060c \u0628\u0627 \u062f\u0648 \u06a9\u0648\u062a\u06cc\u0648\u0645 \u067e\u06cc\u0686\u06cc\u062f\u0647 \u0634\u0631\u0648\u0639 \u06a9\u0631\u062f\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-273.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-273\" width=\"588\" height=\"382\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u062a\u063a\u06cc\u06cc\u0631 <code>'<\/code> \u0628\u0647 <code>\"<\/code> \u06a9\u0647 \u062f\u0631 <code>code.py<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0633\u067e\u0633 \u0628\u0647 \u0635\u062d\u0646\u0647 \u0628\u0631\u062f\u0645 \u0648 \u0645\u062a\u0639\u0647\u062f \u0634\u062f\u0645:<\/p>\n<pre><code>git add code.py\ngit commit -m \"Commit 17\"<\/code><\/pre>\n<p>\u0633\u067e\u0633 \u062a\u0635\u0645\u06cc\u0645 \u06af\u0631\u0641\u062a\u0645 \u06cc\u06a9 \u062a\u0627\u0628\u0639 \u062c\u062f\u06cc\u062f \u062f\u0631 \u0627\u0628\u062a\u062f\u0627\u06cc \u0641\u0627\u06cc\u0644 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-274.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-274\" width=\"590\" height=\"423\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0627\u0628\u0639 <code>another_feature<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0648\u0628\u0627\u0631\u0647 \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc \u06a9\u0631\u062f\u0645 \u0648 \u0645\u062a\u0639\u0647\u062f \u0634\u062f\u0645:<\/p>\n<pre><code>git add code.py\ngit commit -m \"Commit 18\"<\/code><\/pre>\n<p>\u0648 \u0627\u06a9\u0646\u0648\u0646 \u0645\u062a\u0648\u062c\u0647 \u0634\u062f\u0645 \u06a9\u0647 \u062f\u0631 \u0648\u0627\u0642\u0639 \u0641\u0631\u0627\u0645\u0648\u0634 \u06a9\u0631\u062f\u0647 \u0627\u0645 \u06a9\u0647 \u0646\u0642\u0644 \u0642\u0648\u0644 \u0647\u0627\u06cc \u062a\u06a9\u06cc \u0631\u0627 \u0628\u0647 \u0646\u0642\u0644 \u0642\u0648\u0644 \u0647\u0627\u06cc \u062f\u0648\u062a\u0627\u06cc\u06cc \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u0645 <code>__main__<\/code> (\u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0645\u062a\u0648\u062c\u0647 \u0634\u062f\u0647 \u0628\u0627\u0634\u06cc\u062f)\u060c \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0645\u0646 \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0631\u0627 \u0646\u06cc\u0632 \u0627\u0646\u062c\u0627\u0645 \u062f\u0627\u062f\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-275.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-275\" width=\"599\" height=\"446\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u062a\u063a\u06cc\u06cc\u0631 <code>'__main__'<\/code> \u0628\u0647 <code>\"__main__\"<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u0644\u0628\u062a\u0647 \u0645\u0646 \u0627\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0631\u0627 \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc \u0648 \u0627\u0646\u062c\u0627\u0645 \u062f\u0627\u062f\u0645:<\/p>\n<pre><code>git add code.py\ngit commit -m \"Commit 19\"<\/code><\/pre>\n<p>\u062d\u0627\u0644\u060c \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-276.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-276\" width=\"2055\" height=\"593\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0627\u0631\u062a\u06a9\u0627\u0628 \u067e\u0633 \u0627\u0632 \u0645\u0639\u0631\u0641\u06cc &#8220;Commit 19&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<\/p>\n<p>\u0648\u0627\u0642\u0639\u0627\u064b \u062e\u0648\u0628 \u0646\u06cc\u0633\u062a\u060c \u0627\u06cc\u0646\u0637\u0648\u0631 \u0627\u0633\u062a\u061f  \u0645\u0646\u0638\u0648\u0631\u0645 \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0645\u0646 \u062f\u0648 commit \u062f\u0627\u0631\u0645 \u06a9\u0647 \u0628\u0647 \u06cc\u06a9\u062f\u06cc\u06af\u0631 \u0645\u0631\u062a\u0628\u0637 \u0647\u0633\u062a\u0646\u062f\u060c &#8220;Commit 17&#8221; \u0648 &#8220;Commit 19&#8221; (\u0686\u0631\u062e\u0634 <code>'<\/code>\u0628\u0647 <code>\"<\/code>s)\u060c \u0627\u0645\u0627 \u0622\u0646\u0647\u0627 \u062a\u0648\u0633\u0637 &#8220;Commit 18&#8221; \u0646\u0627\u0645\u0631\u062a\u0628\u0637 \u062a\u0642\u0633\u06cc\u0645 \u0645\u06cc \u0634\u0648\u0646\u062f (\u062c\u0627\u06cc\u06cc \u06a9\u0647 \u0645\u0646 \u06cc\u06a9 \u062a\u0627\u0628\u0639 \u062c\u062f\u06cc\u062f \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0645).  \u0686\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u0628\u06a9\u0646\u06cc\u0645\u061f  \ud83e\udd14 \u0645\u06cc\u0634\u0647 \u06a9\u0645\u06a9\u0645 \u06a9\u0646\u06cc\u062f\u061f<\/p>\n<p>\u0628\u0647 \u0637\u0648\u0631 \u0645\u0633\u062a\u0642\u06cc\u0645\u060c \u0645\u0646 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0646\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-277.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-277\" width=\"2058\" height=\"561\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u06cc\u0646\u0647\u0627 commit \u0647\u0627\u06cc\u06cc \u0647\u0633\u062a\u0646\u062f \u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 \u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0646\u0645 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u0686\u0647 \u06a9\u0627\u0631\u06cc \u0627\u0646\u062c\u0627\u0645 \u0645\u06cc \u062f\u0647\u06cc\u062f\u061f<\/p>\n<p>\u062d\u0642 \u0628\u0627 \u0634\u0645\u0627\u0633\u062a!  \ud83d\udc4f\ud83c\udffb<\/p>\n<p>\u0645\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u0645 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u0627\u0632 &#8220;Commit 17&#8221; \u0628\u0647 &#8220;Commit 19&#8221; \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc &#8220;Commit 15&#8221; \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u0645.  \u0628\u0631\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0622\u0646:<\/p>\n<pre><code>git rebase --interactive --onto &lt;SHA_OF_COMMIT_15&gt; &lt;SHA_OF_COMMIT_15&gt;<\/code><\/pre>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u0645\u0646 &#8220;Commit 15&#8221; \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0627\u0628\u062a\u062f\u0627\u06cc \u0645\u062d\u062f\u0648\u062f\u0647 commit \u0647\u0627\u060c \u0628\u0647 \u0627\u0633\u062a\u062b\u0646\u0627\u06cc \u0627\u06cc\u0646 commit\u060c \u0645\u0634\u062e\u0635 \u06a9\u0631\u062f\u0645.  \u0648 \u0646\u06cc\u0627\u0632\u06cc \u0628\u0647 \u0630\u06a9\u0631 \u0635\u0631\u06cc\u062d \u0646\u062f\u0627\u0634\u062a\u0645 <code>HEAD<\/code> \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0622\u062e\u0631\u06cc\u0646 \u067e\u0627\u0631\u0627\u0645\u062a\u0631<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-279.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-279\" width=\"1023\" height=\"391\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0646 <code>rebase --onto<\/code> \u062f\u0631 \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u0648\u0627\u062d\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u067e\u0633 \u0627\u0632 \u067e\u06cc\u0631\u0648\u06cc \u0627\u0632 \u062a\u0648\u0635\u06cc\u0647 \u0634\u0645\u0627 \u0648 \u0627\u062c\u0631\u0627\u06cc \u0622\u0646 <code>rebase<\/code> \u062f\u0633\u062a\u0648\u0631 (\u0628\u0627 \u062a\u0634\u06a9\u0631! \ud83d\ude07) \u0635\u0641\u062d\u0647 \u0632\u06cc\u0631 \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u0645\u06cc \u06a9\u0646\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-280.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-280\" width=\"904\" height=\"638\" loading=\"lazy\" title=\"\"><figcaption>rebase \u062a\u0639\u0627\u0645\u0644\u06cc (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u067e\u0633 \u0645\u0646 \u0686\u0647 \u06a9\u0627\u0631 \u06a9\u0646\u0645\u061f  \u0645\u0646 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 &#8220;Commit 19&#8221; \u0631\u0627 \u0628\u06af\u0630\u0627\u0631\u0645 <em>\u0642\u0628\u0644 \u0627\u0632<\/em> &#8220;Commit 18&#8243;\u060c \u067e\u0633 \u062f\u0631\u0633\u062a \u0628\u0639\u062f \u0627\u0632 &#8220;Commit 17&#8221; \u0645\u06cc \u0622\u06cc\u062f.  \u0645\u06cc \u062a\u0648\u0627\u0646\u0645 \u062c\u0644\u0648\u062a\u0631 \u0628\u0631\u0648\u0645 \u0648 \u0622\u0646\u0647\u0627 \u0631\u0627 \u0628\u0627 \u0647\u0645 \u0644\u0647 \u06a9\u0646\u0645\u060c \u0645\u0627\u0646\u0646\u062f \u0627\u06cc\u0646:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-281.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-281\" width=\"1010\" height=\"396\" loading=\"lazy\" title=\"\"><figcaption>Rebase \u062a\u0639\u0627\u0645\u0644\u06cc &#8211; \u062a\u063a\u06cc\u06cc\u0631 \u062a\u0631\u062a\u06cc\u0628 commit \u0648 squashing (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u0647\u0646\u06af\u0627\u0645\u06cc \u06a9\u0647 \u0627\u0632 \u0645\u0646 \u0628\u0631\u0627\u06cc \u06cc\u06a9 \u067e\u06cc\u0627\u0645 commit \u062e\u0648\u0627\u0633\u062a\u0647 \u0645\u06cc \u0634\u0648\u062f\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u0645 \u067e\u06cc\u0627\u0645 &#8220;Commit 17+19&#8221; \u0631\u0627 \u0627\u0631\u0627\u0626\u0647 \u06a9\u0646\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-282.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-282\" width=\"799\" height=\"393\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0631\u0627\u0626\u0647 \u067e\u06cc\u0627\u0645 commit (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u0627\u06a9\u0646\u0648\u0646\u060c \u062a\u0627\u0631\u06cc\u062e \u0632\u06cc\u0628\u0627\u06cc \u0645\u0627 \u0631\u0627 \u0628\u0628\u06cc\u0646\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-283.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-283\" width=\"1030\" height=\"493\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u062d\u0627\u0635\u0644 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u0627\u0632\u0645 \u0645\u0645\u0646\u0648\u0646  \ud83d\ude4c\ud83c\udffb<\/p>\n<h1 id=\"more-rebase-use-cases-more-practice\"><span class=\"ez-toc-section\" id=\"%d9%85%d9%88%d8%a7%d8%b1%d8%af_%d8%a7%d8%b3%d8%aa%d9%81%d8%a7%d8%af%d9%87_rebase_%d8%a8%db%8c%d8%b4%d8%aa%d8%b1_%d8%aa%d9%85%d8%b1%db%8c%d9%86_%d8%a8%db%8c%d8%b4%d8%aa%d8%b1\"><\/span>\u0645\u0648\u0627\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 Rebase \u0628\u06cc\u0634\u062a\u0631 + \u062a\u0645\u0631\u06cc\u0646 \u0628\u06cc\u0634\u062a\u0631<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631 \u0627\u0645\u06cc\u062f\u0648\u0627\u0631\u0645 \u0628\u0627 \u0646\u062d\u0648 rebase \u0627\u062d\u0633\u0627\u0633 \u0631\u0627\u062d\u062a\u06cc \u06a9\u0646\u06cc\u062f.  \u0628\u0647\u062a\u0631\u06cc\u0646 \u0631\u0627\u0647 \u0628\u0631\u0627\u06cc \u062f\u0631\u06a9 \u0648\u0627\u0642\u0639\u06cc \u0622\u0646 \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0645\u0648\u0627\u0631\u062f \u0645\u062e\u062a\u0644\u0641 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f \u0648 \u0646\u062d\u0648\u0647 \u062d\u0644 \u0622\u0646\u0647\u0627 \u0631\u0627 \u062e\u0648\u062f\u062a\u0627\u0646 \u0628\u06cc\u0627\u0628\u06cc\u062f. <\/p>\n<p>\u0628\u0627 \u062a\u0648\u062c\u0647 \u0628\u0647 \u0645\u0648\u0627\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0622\u062a\u06cc\u060c \u0627\u06a9\u06cc\u062f\u0627\u064b \u067e\u06cc\u0634\u0646\u0647\u0627\u062f \u0645\u06cc \u06a9\u0646\u0645 \u067e\u0633 \u0627\u0632 \u0645\u0639\u0631\u0641\u06cc \u0647\u0631 \u0645\u0648\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647\u060c \u0645\u0637\u0627\u0644\u0639\u0647 \u0631\u0627 \u0645\u062a\u0648\u0642\u0641 \u06a9\u0646\u06cc\u062f \u0648 \u0633\u067e\u0633 \u0633\u0639\u06cc \u06a9\u0646\u06cc\u062f \u0622\u0646 \u0631\u0627 \u062e\u0648\u062f\u062a\u0627\u0646 \u062d\u0644 \u06a9\u0646\u06cc\u062f.<\/p>\n<h2 id=\"how-to-exclude-commits\"><span class=\"ez-toc-section\" id=\"%d9%86%d8%ad%d9%88%d9%87_%d8%ad%d8%b0%d9%81_%d8%aa%d8%b9%d9%87%d8%af%d8%a7%d8%aa\"><\/span>\u0646\u062d\u0648\u0647 \u062d\u0630\u0641 \u062a\u0639\u0647\u062f\u0627\u062a <span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>\u0628\u06af\u0648\u06cc\u06cc\u062f \u0627\u06cc\u0646 \u0633\u0627\u0628\u0642\u0647 \u0631\u0627 \u062f\u0631 \u0645\u062e\u0632\u0646 \u062f\u06cc\u06af\u0631\u06cc \u062f\u0627\u0631\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-284.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-284\" width=\"2000\" height=\"438\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0627\u0631\u062a\u06a9\u0627\u0628 \u062f\u06cc\u06af\u0631\u06cc (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<\/p>\n<p>\u0642\u0628\u0644 \u0627\u0632 \u0628\u0627\u0632\u06cc \u06a9\u0631\u062f\u0646 \u0628\u0627 \u0622\u0646\u060c \u06cc\u06a9 \u0628\u0631\u0686\u0633\u0628 \u0631\u0627 \u062f\u0631 &#8220;Commit F&#8221; \u0630\u062e\u06cc\u0631\u0647 \u06a9\u0646\u06cc\u062f \u062a\u0627 \u0628\u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0639\u062f\u0627\u064b \u0628\u0647 \u0622\u0646 \u0628\u0627\u0632\u06af\u0631\u062f\u06cc\u062f:<\/p>\n<pre><code>git tag original_commit_f<\/code><\/pre>\n<p>\u0627\u06a9\u0646\u0648\u0646\u060c \u0634\u0645\u0627 \u062f\u0631 \u0648\u0627\u0642\u0639 \u0646\u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u062f\u0631 &#8220;Commit C&#8221; \u0648 &#8220;Commit D&#8221; \u06af\u0646\u062c\u0627\u0646\u062f\u0647 \u0634\u0648\u062f.  \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0645\u0627\u0646\u0646\u062f \u0642\u0628\u0644 \u0627\u0632 \u06cc\u06a9 rebase \u062a\u0639\u0627\u0645\u0644\u06cc \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f \u0648 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0622\u0646\u0647\u0627 \u0631\u0627 \u062d\u0630\u0641 \u06a9\u0646\u06cc\u062f.  \u06cc\u0627\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u062f\u0648\u0628\u0627\u0631\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u062f <code>git rebase -\u2013onto<\/code>.  \u0686\u06af\u0648\u0646\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u062f <code>--onto<\/code> \u0628\u0631\u0627\u06cc &#8220;\u062d\u0630\u0641&#8221; \u0627\u06cc\u0646 \u062f\u0648 commit\u061f<\/p>\n<p>\u0634\u0645\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f rebase \u06a9\u0646\u06cc\u062f <code>HEAD<\/code> \u062f\u0631 \u0628\u0627\u0644\u0627\u06cc &#8220;Commit B&#8221;\u060c \u062c\u0627\u06cc\u06cc \u06a9\u0647 \u0648\u0627\u0644\u062f \u0642\u062f\u06cc\u0645\u06cc \u062f\u0631 \u0648\u0627\u0642\u0639 &#8220;Commit D&#8221; \u0628\u0648\u062f \u0648 \u0627\u06a9\u0646\u0648\u0646 \u0628\u0627\u06cc\u062f &#8220;Commit B&#8221; \u0628\u0627\u0634\u062f.  \u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u062f\u0648\u0628\u0627\u0631\u0647 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-284.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-284\" width=\"2000\" height=\"438\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e \u062f\u0648\u0628\u0627\u0631\u0647 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>Rebasing \u0628\u0647 \u0637\u0648\u0631\u06cc \u06a9\u0647 &#8220;Commit B&#8221; \u067e\u0627\u06cc\u0647 &#8220;Commit E&#8221; \u0628\u0627\u0634\u062f\u060c \u0628\u0647 \u0645\u0639\u0646\u0627\u06cc &#8220;\u062d\u0631\u06a9\u062a&#8221; \u0647\u0631 \u062f\u0648 &#8220;Commit E&#8221; \u0648 &#8220;Commit F&#8221; \u0648 \u062f\u0627\u062f\u0646 \u062f\u06cc\u06af\u0631\u06cc \u0628\u0647 \u0622\u0646\u0647\u0627 \u0627\u0633\u062a. <em>\u067e\u0627\u06cc\u0647<\/em> \u2013 \u00ab\u062a\u0639\u0647\u062f \u0628\u00bb.  \u0622\u06cc\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u062e\u0648\u062f\u062a\u0627\u0646 \u062f\u0633\u062a\u0648\u0631 \u0631\u0627 \u0627\u0631\u0627\u0626\u0647 \u062f\u0647\u06cc\u062f\u061f<\/p>\n<pre><code>git rebase --onto &lt;SHA_OF_COMMIT_B&gt; &lt;SHA_OF_COMMIT_D&gt; HEAD<\/code><\/pre>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0646\u062d\u0648 \u0628\u0627\u0644\u0627 \u062d\u0631\u06a9\u062a \u0646\u0645\u06cc \u06a9\u0646\u062f <code>main<\/code> \u0628\u0631\u0627\u06cc \u0627\u0634\u0627\u0631\u0647 \u0628\u0647 commit \u062c\u062f\u06cc\u062f\u060c \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0646\u062a\u06cc\u062c\u0647 \u06cc\u06a9 &#8220;\u062c\u062f\u0627\u06cc\u06cc&#8221; \u0627\u0633\u062a <code>HEAD<\/code>.  \u0627\u06af\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u062f <code>gg<\/code> \u06cc\u0627 \u0627\u0628\u0632\u0627\u0631 \u062f\u06cc\u06af\u0631\u06cc \u06a9\u0647 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0642\u0627\u0628\u0644 \u062f\u0633\u062a\u0631\u0633\u06cc \u0627\u0632 \u0634\u0627\u062e\u0647 \u0647\u0627 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0634\u0645\u0627 \u0631\u0627 \u06af\u06cc\u062c \u06a9\u0646\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-285.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-285\" width=\"859\" height=\"462\" loading=\"lazy\" title=\"\"><figcaption>Rebasing \u0628\u0627 <code>--onto<\/code> \u0645\u0646\u062c\u0631 \u0628\u0647 \u062c\u062f\u0627 \u0634\u062f\u0646 \u0645\u06cc \u0634\u0648\u062f <code>HEAD<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u0645\u0627 \u0627\u06af\u0631 \u0628\u0647 \u0633\u0627\u062f\u06af\u06cc \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git log<\/code> (\u06cc\u0627 \u0646\u0627\u0645 \u0645\u0633\u062a\u0639\u0627\u0631 \u0645\u0646 <code>git lol<\/code>\u060c \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u0631\u0627 \u062e\u0648\u0627\u0647\u06cc\u062f \u062f\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-286.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-286\" width=\"740\" height=\"136\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u062d\u0627\u0635\u0644 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0645\u0646 \u062f\u0631 \u0645\u0648\u0631\u062f \u0634\u0645\u0627 \u0646\u0645\u06cc \u062f\u0627\u0646\u0645\u060c \u0627\u0645\u0627 \u0627\u06cc\u0646 \u0646\u0648\u0639 \u0686\u06cc\u0632\u0647\u0627 \u0645\u0646 \u0631\u0627 \u0648\u0627\u0642\u0639\u0627 \u062e\u0648\u0634\u062d\u0627\u0644 \u0645\u06cc \u06a9\u0646\u062f.  \ud83d\ude0a\ud83d\ude07<\/p>\n<p>\u0628\u0647 \u0647\u0631 \u062d\u0627\u0644\u060c \u0634\u0645\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u062d\u0630\u0641 \u06a9\u0646\u06cc\u062f <code>HEAD<\/code> \u0627\u0632 \u062f\u0633\u062a\u0648\u0631 \u0642\u0628\u0644\u06cc \u0632\u06cc\u0631\u0627 \u0627\u06cc\u0646 \u0645\u0642\u062f\u0627\u0631 \u067e\u06cc\u0634 \u0641\u0631\u0636 \u0628\u0631\u0627\u06cc \u067e\u0627\u0631\u0627\u0645\u062a\u0631 \u0633\u0648\u0645 \u0627\u0633\u062a.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0641\u0642\u0637 \u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632:<\/p>\n<pre><code>git rebase --onto &lt;SHA_OF_COMMIT_B&gt; &lt;SHA_OF_COMMIT_D&gt;<\/code><\/pre>\n<p>\u0647\u0645\u06cc\u0646 \u062a\u0627\u062b\u06cc\u0631 \u0631\u0627 \u062e\u0648\u0627\u0647\u062f \u062f\u0627\u0634\u062a  \u0622\u062e\u0631\u06cc\u0646 \u067e\u0627\u0631\u0627\u0645\u062a\u0631 \u062f\u0631 \u0648\u0627\u0642\u0639 \u0628\u0647 Git \u0645\u06cc \u06af\u0648\u06cc\u062f \u06a9\u0647 \u067e\u0627\u06cc\u0627\u0646 \u062f\u0646\u0628\u0627\u0644\u0647 \u0641\u0639\u0644\u06cc commits \u0628\u0631\u0627\u06cc rebase \u06a9\u062c\u0627\u0633\u062a.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0646\u062d\u0648 \u0627\u0632 <code>git rebase --onto<\/code> \u0628\u0627 \u0633\u0647 \u0622\u0631\u06af\u0648\u0645\u0627\u0646 \u0627\u0633\u062a:<\/p>\n<pre><code>git rebase --onto &lt;new_parent&gt; &lt;old_parent&gt; &lt;until&gt;<\/code><\/pre>\n<h2 id=\"how-to-move-commits-across-branches\"><span class=\"ez-toc-section\" id=\"%d9%86%d8%ad%d9%88%d9%87_%d8%ac%d8%a7%d8%a8%d8%ac%d8%a7%db%8c%db%8c_commit_%d9%87%d8%a7_%d8%af%d8%b1_%d8%b4%d8%a7%d8%ae%d9%87_%d9%87%d8%a7\"><\/span>\u0646\u062d\u0648\u0647 \u062c\u0627\u0628\u062c\u0627\u06cc\u06cc commit \u0647\u0627 \u062f\u0631 \u0634\u0627\u062e\u0647 \u0647\u0627<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0628\u06cc\u0627\u06cc\u06cc\u062f \u0628\u06af\u0648\u06cc\u06cc\u0645 \u06a9\u0647 \u0628\u0647 \u0647\u0645\u0627\u0646 \u062a\u0627\u0631\u06cc\u062e \u0642\u0628\u0644\u06cc \u0645\u06cc \u0631\u0633\u06cc\u0645:<\/p>\n<pre><code>git checkout original_commit_f<\/code><\/pre>\n<p>\u0648 \u0627\u06a9\u0646\u0648\u0646 \u0641\u0642\u0637 &#8220;Commit E&#8221; \u0631\u0627 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 \u06a9\u0647 \u062f\u0631 \u06cc\u06a9 \u0634\u0627\u062e\u0647 \u0645\u0628\u062a\u0646\u06cc \u0628\u0631 &#8220;Commit B&#8221; \u0628\u0627\u0634\u062f.  \u06cc\u0639\u0646\u06cc \u0645\u0646 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 \u06cc\u06a9 \u0634\u0639\u0628\u0647 \u062c\u062f\u06cc\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u0645 \u06a9\u0647 \u0627\u0632 \u00abCommit B\u00bb \u0645\u0646\u0634\u0639\u0628 \u0645\u06cc \u0634\u0648\u062f \u0648 \u0641\u0642\u0637 \u00abCommit E\u00bb \u062f\u0627\u0631\u062f.<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-287.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-287\" width=\"2000\" height=\"590\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0641\u0639\u0644\u06cc\u060c \u0628\u0627 \u062a\u0648\u062c\u0647 \u0628\u0647 &#8220;Commit E&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u0627\u06cc\u0646 \u0628\u0647 \u0686\u0647 \u0645\u0639\u0646\u0627\u0633\u062a \u0627\u0632 \u0646\u0638\u0631 rebase\u061f  \u062a\u0635\u0648\u06cc\u0631 \u0628\u0627\u0644\u0627 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f.  \u0686\u0647 commit (\u06cc\u0627 commit \u0647\u0627\u06cc\u06cc) \u0631\u0627 \u0628\u0627\u06cc\u062f \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u0645 \u0648 \u06a9\u062f\u0627\u0645 commit \u067e\u0627\u06cc\u0647 \u062c\u062f\u06cc\u062f \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f\u061f<\/p>\n<p>\u0645\u06cc\u062f\u0648\u0646\u0645 \u0627\u06cc\u0646\u062c\u0627 \u0645\u06cc\u062a\u0648\u0646\u0645 \u0631\u0648\u06cc \u062a\u0648 \u062d\u0633\u0627\u0628 \u06a9\u0646\u0645\ud83d\ude09<\/p>\n<p>\u0622\u0646\u0686\u0647 \u0645\u0646 \u0645\u06cc \u062e\u0648\u0627\u0647\u0645 \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 &#8220;Commit E&#8221; \u0648 \u0641\u0642\u0637 \u0627\u06cc\u0646 commit \u0631\u0627 \u0628\u06af\u06cc\u0631\u0645 \u0648 \u067e\u0627\u06cc\u0647 \u0622\u0646 \u0631\u0627 \u0628\u0647 &#8220;Commit B&#8221; \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u0645.  \u0628\u0647 \u0639\u0628\u0627\u0631\u062a \u062f\u06cc\u06af\u0631\u060c \u0628\u0647 <em>\u0628\u0627\u0632\u067e\u062e\u0634<\/em> \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0627\u0631\u0627\u0626\u0647 \u0634\u062f\u0647 \u062f\u0631 &#8220;Commit E&#8221; \u0628\u0631 \u0631\u0648\u06cc &#8220;Commit B&#8221;.<\/p>\n<p>\u0622\u06cc\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0622\u0646 \u0645\u0646\u0637\u0642 \u0631\u0627 \u062f\u0631 \u0646\u062d\u0648 \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u06cc\u062f <code>git rebase<\/code>?<\/p>\n<p>\u0627\u06cc\u0646\u062c\u0627\u0633\u062a (\u0627\u06cc\u0646 \u0628\u0627\u0631 \u062f\u0627\u0631\u0645 \u0645\u06cc \u0646\u0648\u06cc\u0633\u0645 <code>&lt;COMMIT_B&gt;<\/code> \u0628\u062c\u0627\u06cc <code>&lt;SHA_OF_COMMIT_B&gt;<\/code>\u0628\u0631\u0627\u06cc \u0627\u062e\u062a\u0635\u0627\u0631):<\/p>\n<pre><code>git rebase \u2013-onto &lt;COMMIT_B&gt; &lt;COMMIT_D&gt; &lt;COMMIT_E&gt;<\/code><\/pre>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u062a\u0627\u0631\u06cc\u062e \u0628\u0647 \u0627\u06cc\u0646 \u0634\u06a9\u0644 \u0627\u0633\u062a:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-288.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-288\" width=\"2000\" height=\"572\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 rebase (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0639\u0627\u0644\u06cc!<\/p>\n<h1 id=\"a-note-about-conflicts\"><span class=\"ez-toc-section\" id=\"%d9%86%da%a9%d8%aa%d9%87_%d8%a7%db%8c_%d8%af%d8%b1_%d9%85%d9%88%d8%b1%d8%af_%d8%aa%d8%b9%d8%a7%d8%b1%d8%b6%d8%a7%d8%aa\"><\/span>\u0646\u06a9\u062a\u0647 \u0627\u06cc \u062f\u0631 \u0645\u0648\u0631\u062f \u062a\u0639\u0627\u0631\u0636\u0627\u062a<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u0647\u0646\u06af\u0627\u0645 \u0627\u0646\u062c\u0627\u0645 \u06cc\u06a9 rebase\u060c \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0645\u0627\u0646\u0646\u062f \u0647\u0646\u06af\u0627\u0645 \u0627\u062f\u063a\u0627\u0645 \u0628\u0627 \u062a\u062f\u0627\u062e\u0644 \u0645\u0648\u0627\u062c\u0647 \u0634\u0648\u06cc\u062f.  \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u062a\u062f\u0627\u062e\u0644 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u0632\u06cc\u0631\u0627 \u0647\u0646\u06af\u0627\u0645 \u062a\u063a\u06cc\u06cc\u0631 \u067e\u0627\u06cc\u0647\u060c \u0633\u0639\u06cc \u0645\u06cc\u200c\u06a9\u0646\u06cc\u062f \u0648\u0635\u0644\u0647\u200c\u0647\u0627 \u0631\u0627 \u0631\u0648\u06cc \u067e\u0627\u06cc\u0647 \u062f\u06cc\u06af\u0631\u06cc \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u06cc\u062f\u060c \u0634\u0627\u06cc\u062f \u062f\u0631 \u062c\u0627\u06cc\u06cc \u06a9\u0647 \u0648\u0635\u0644\u0647\u200c\u0647\u0627 \u0627\u0639\u0645\u0627\u0644 \u0646\u0645\u06cc\u200c\u0634\u0648\u0646\u062f.<\/p>\n<p>\u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u062b\u0627\u0644\u060c \u0645\u062e\u0632\u0646 \u0642\u0628\u0644\u06cc \u0631\u0627 \u062f\u0648\u0628\u0627\u0631\u0647 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f\u060c \u0648 \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635\u060c \u062a\u063a\u06cc\u06cc\u0631 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062f\u0631 &#8220;Commit 12&#8221; \u0631\u0627 \u06a9\u0647 \u062a\u0648\u0633\u0637 <code>main<\/code>:<\/p>\n<pre><code>git show main<\/code><\/pre>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-289.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-289\" width=\"714\" height=\"453\" loading=\"lazy\" title=\"\"><figcaption>\u067e\u0686 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062f\u0631 &#8220;Commit 12&#8221; (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0645\u0646 \u0642\u0628\u0644\u0627\u064b \u0628\u0647 \u0641\u0631\u0645\u062a \u0622\u0646 \u067e\u0631\u062f\u0627\u062e\u062a\u0645 <code>git diff<\/code> \u0628\u0647 \u062a\u0641\u0635\u06cc\u0644 \u062f\u0631 \u067e\u0633\u062a \u0642\u0628\u0644\u06cc\u060c \u0627\u0645\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u06a9 \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc \u0633\u0631\u06cc\u0639\u060c \u0627\u06cc\u0646 commit \u0628\u0647 Git \u062f\u0633\u062a\u0648\u0631 \u0645\u06cc \u062f\u0647\u062f \u062a\u0627 \u06cc\u06a9 \u062e\u0637 \u0628\u0639\u062f \u0627\u0632 \u062f\u0648 \u062e\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u062f:<\/p>\n<pre><code>```\nThis is a sample file<\/code><\/pre>\n<p>\u0648 \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0647 \u062e\u0637 \u0632\u0645\u06cc\u0646\u0647:<\/p>\n<pre><code>```\ndef new_feature():\n  print('new feature')<\/code><\/pre>\n<p>\u0628\u06af\u0648\u06cc\u06cc\u062f \u06a9\u0647 \u0645\u06cc\u200c\u062e\u0648\u0627\u0647\u06cc\u062f \u00abCommit 12\u00bb \u0631\u0627 \u0628\u0647 \u06cc\u06a9 commit \u062f\u06cc\u06af\u0631 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u06cc\u062f.  \u0627\u06af\u0631 \u0628\u0647 \u062f\u0644\u0627\u06cc\u0644\u06cc\u060c \u0627\u06cc\u0646 \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0645\u0627\u0646\u0646\u062f \u0648\u0635\u0644\u0647 \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 commit \u06a9\u0647 \u062f\u0631 \u062d\u0627\u0644 \u062a\u063a\u06cc\u06cc\u0631 \u0622\u0646 \u0647\u0633\u062a\u06cc\u062f \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f. <em>\u0628\u0647 \u0633\u0648\u06cc<\/em>\u060c \u062f\u0631 \u0627\u06cc\u0646 \u0635\u0648\u0631\u062a \u062f\u0631\u06af\u06cc\u0631\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u062f\u0627\u0634\u062a.  \u0628\u0631\u0627\u06cc \u06a9\u0633\u0628 \u0627\u0637\u0644\u0627\u0639\u0627\u062a \u0628\u06cc\u0634\u062a\u0631 \u062f\u0631 \u0645\u0648\u0631\u062f \u062a\u0636\u0627\u062f\u0647\u0627 \u0648 \u0646\u062d\u0648\u0647 \u062d\u0644 \u0622\u0646\u0647\u0627\u060c \u0628\u0647 \u0627\u06cc\u0646 \u0631\u0627\u0647\u0646\u0645\u0627 \u0645\u0631\u0627\u062c\u0639\u0647 \u06a9\u0646\u06cc\u062f.<\/p>\n<h1 id=\"zooming-out-for-the-big-picture\"><span class=\"ez-toc-section\" id=\"%d8%a8%d8%b2%d8%b1%da%af%d9%86%d9%85%d8%a7%db%8c%db%8c_%d8%a8%d8%b1%d8%a7%db%8c_%d8%aa%d8%b5%d9%88%db%8c%d8%b1_%d8%a8%d8%b2%d8%b1%da%af\"><\/span>\u0628\u0632\u0631\u06af\u0646\u0645\u0627\u06cc\u06cc \u0628\u0631\u0627\u06cc \u062a\u0635\u0648\u06cc\u0631 \u0628\u0632\u0631\u06af<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-290.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-290\" width=\"2000\" height=\"699\" loading=\"lazy\" title=\"\"><figcaption>\u0645\u0642\u0627\u06cc\u0633\u0647 rebase \u0648 \u0627\u062f\u063a\u0627\u0645 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0631 \u0627\u0628\u062a\u062f\u0627\u06cc \u0627\u06cc\u0646 \u0631\u0627\u0647\u0646\u0645\u0627\u060c \u0645\u0646 \u0628\u0627 \u0630\u06a9\u0631 \u0634\u0628\u0627\u0647\u062a \u0628\u06cc\u0646 \u0627\u06cc\u0646 \u062f\u0648 \u0634\u0631\u0648\u0639 \u06a9\u0631\u062f\u0645 <code>git merge<\/code> \u0648 <code>git rebase<\/code>: \u0647\u0631 \u062f\u0648 \u0628\u0631\u0627\u06cc \u0627\u062f\u063a\u0627\u0645 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0627\u0631\u0627\u0626\u0647 \u0634\u062f\u0647 \u062f\u0631 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u0634\u0648\u0646\u062f. <\/p>\n<p>\u0627\u0645\u0627\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0627\u06a9\u0646\u0648\u0646 \u0645\u06cc \u062f\u0627\u0646\u06cc\u062f\u060c \u0622\u0646\u0647\u0627 \u062f\u0631 \u0646\u062d\u0648\u0647 \u0639\u0645\u0644\u06a9\u0631\u062f \u0628\u0633\u06cc\u0627\u0631 \u0645\u062a\u0641\u0627\u0648\u062a \u0647\u0633\u062a\u0646\u062f.  \u062f\u0631 \u062d\u0627\u0644\u06cc \u06a9\u0647 \u0627\u062f\u063a\u0627\u0645 \u0645\u0646\u062c\u0631 \u0628\u0647 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0648\u0627\u06af\u0631\u0627 \u0645\u06cc \u0634\u0648\u062f\u060c \u062a\u063a\u06cc\u06cc\u0631 \u067e\u0627\u06cc\u0647 \u0645\u0646\u062c\u0631 \u0628\u0647 \u06cc\u06a9 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u062e\u0637\u06cc \u0645\u06cc \u0634\u0648\u062f.  \u062a\u0639\u0627\u0631\u0636 \u062f\u0631 \u0647\u0631 \u062f\u0648 \u0645\u0648\u0631\u062f \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a.  \u0648 \u06cc\u06a9 \u0633\u062a\u0648\u0646 \u062f\u06cc\u06af\u0631 \u062f\u0631 \u062c\u062f\u0648\u0644 \u0628\u0627\u0644\u0627 \u062a\u0648\u0636\u06cc\u062d \u062f\u0627\u062f\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a \u06a9\u0647 \u0646\u06cc\u0627\u0632 \u0628\u0647 \u062a\u0648\u062c\u0647 \u062f\u0642\u06cc\u0642 \u062f\u0627\u0631\u062f.<\/p>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u06a9\u0647 \u0645\u06cc \u062f\u0627\u0646\u06cc\u062f &#8220;Git rebase&#8221; \u0686\u06cc\u0633\u062a \u0648 \u0686\u06af\u0648\u0646\u0647 \u0627\u0632 rebase \u062a\u0639\u0627\u0645\u0644\u06cc \u06cc\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>rebase --onto<\/code>\u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0627\u0645\u06cc\u062f\u0648\u0627\u0631\u0645 \u0645\u0648\u0627\u0641\u0642 \u0628\u0627\u0634\u06cc\u062f <code>git rebase<\/code> \u06cc\u06a9 \u0627\u0628\u0632\u0627\u0631 \u0641\u0648\u0642 \u0627\u0644\u0639\u0627\u062f\u0647 \u0642\u062f\u0631\u062a\u0645\u0646\u062f \u0627\u0633\u062a  \u0628\u0627 \u0627\u06cc\u0646 \u062d\u0627\u0644\u060c \u062f\u0631 \u0645\u0642\u0627\u06cc\u0633\u0647 \u0628\u0627 \u0627\u062f\u063a\u0627\u0645\u060c \u06cc\u06a9 \u0627\u0634\u06a9\u0627\u0644 \u0628\u0632\u0631\u06af \u062f\u0627\u0631\u062f.<\/p>\n<p>Git rebase \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u0645\u06cc \u062f\u0647\u062f.<\/p>\n<p>\u0627\u06cc\u0646 \u0628\u0647 \u0627\u06cc\u0646 \u0645\u0639\u0646\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0634\u0645\u0627 \u0628\u0627\u06cc\u062f <strong>\u0646\u0647<\/strong> rebase commit \u0647\u0627\u06cc\u06cc \u06a9\u0647 \u062e\u0627\u0631\u062c \u0627\u0632 \u06a9\u067e\u06cc \u0645\u062d\u0644\u06cc \u0634\u0645\u0627 \u0627\u0632 \u0645\u062e\u0632\u0646 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f \u0648 \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0627\u0641\u0631\u0627\u062f \u062f\u06cc\u06af\u0631 \u062a\u0639\u0647\u062f\u0627\u062a \u062e\u0648\u062f \u0631\u0627 \u0628\u0631 \u0627\u0633\u0627\u0633 \u0622\u0646 \u0628\u0646\u0627 \u06a9\u0631\u062f\u0647 \u0628\u0627\u0634\u0646\u062f.<\/p>\n<p>\u0628\u0647 \u0639\u0628\u0627\u0631\u062a \u062f\u06cc\u06af\u0631\u060c \u0627\u06af\u0631 \u062a\u0646\u0647\u0627 commit \u0647\u0627\u06cc \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u0622\u0646\u0647\u0627\u06cc\u06cc \u0647\u0633\u062a\u0646\u062f \u06a9\u0647 \u0628\u0647 \u0635\u0648\u0631\u062a \u0645\u062d\u0644\u06cc \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u0647 \u0627\u06cc\u062f &#8211; \u0627\u062f\u0627\u0645\u0647 \u062f\u0647\u06cc\u062f\u060c \u0627\u0632 rebase \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f\u060c \u0648\u062d\u0634\u06cc \u0634\u0648\u06cc\u062f.<\/p>\n<p>\u0627\u0645\u0627 \u0627\u06af\u0631 commit \u0647\u0627 \u062a\u062d\u062a \u0641\u0634\u0627\u0631 \u0642\u0631\u0627\u0631 \u06af\u0631\u0641\u062a\u0647 \u0628\u0627\u0634\u0646\u062f\u060c \u0627\u06cc\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0628\u0647 \u06cc\u06a9 \u0645\u0634\u06a9\u0644 \u0628\u0632\u0631\u06af \u0645\u0646\u062c\u0631 \u0634\u0648\u062f &#8211; \u0632\u06cc\u0631\u0627 \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0634\u062e\u0635 \u062f\u06cc\u06af\u0631\u06cc \u0628\u0647 \u0627\u06cc\u0646 commit \u0647\u0627 \u0627\u0639\u062a\u0645\u0627\u062f \u06a9\u0646\u062f\u060c \u06a9\u0647 \u0628\u0639\u062f\u0627\u064b \u0622\u0646\u0647\u0627 \u0631\u0627 \u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc \u0645\u06cc \u06a9\u0646\u06cc\u062f\u060c \u0648 \u0633\u067e\u0633 \u0634\u0645\u0627 \u0648 \u0622\u0646\u0647\u0627 \u0646\u0633\u062e\u0647 \u0647\u0627\u06cc \u0645\u062a\u0641\u0627\u0648\u062a\u06cc \u0627\u0632 \u0645\u062e\u0632\u0646 \u062e\u0648\u0627\u0647\u06cc\u062f \u062f\u0627\u0634\u062a. <\/p>\n<p>\u0627\u06cc\u0646 \u0628\u0631 \u062e\u0644\u0627\u0641 \u0627\u0633\u062a <code>merge<\/code> \u06a9\u0647 \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u062f\u06cc\u062f\u06cc\u0645 \u062a\u0627\u0631\u06cc\u062e \u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u0646\u0645\u06cc \u062f\u0647\u062f.<\/p>\n<p>\u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u062b\u0627\u0644\u060c \u0622\u062e\u0631\u06cc\u0646 \u0645\u0648\u0631\u062f\u06cc \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f \u06a9\u0647 \u062f\u0631 \u0622\u0646 \u0627\u06cc\u0646 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0631\u0627 \u0645\u062c\u062f\u062f\u0627\u064b \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0627\u062f\u06cc\u0645 \u0648 \u0628\u0647 \u0646\u062a\u06cc\u062c\u0647 \u0631\u0633\u06cc\u062f\u06cc\u0645:<\/p>\n<figure class=\"kg-card kg-image-card kg-width-wide kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/image-288.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-288\" width=\"2000\" height=\"572\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u067e\u0633 \u0627\u0632 rebase (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062d\u0627\u0644\u060c \u0641\u0631\u0636 \u06a9\u0646\u06cc\u062f \u06a9\u0647 \u0645\u0646 \u0642\u0628\u0644\u0627\u064b \u0627\u06cc\u0646 \u0634\u0627\u062e\u0647 \u0631\u0627 \u0628\u0647 \u0631\u06cc\u0645\u0648\u062a \u0641\u0634\u0627\u0631 \u062f\u0627\u062f\u0647 \u0627\u0645.  \u0648 \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646\u06a9\u0647 \u0634\u0627\u062e\u0647 \u0631\u0627 \u0647\u0644 \u062f\u0627\u062f\u0645\u060c \u062a\u0648\u0633\u0639\u0647 \u062f\u0647\u0646\u062f\u0647 \u062f\u06cc\u06af\u0631\u06cc \u0622\u0646 \u0631\u0627 \u06a9\u0634\u06cc\u062f \u0648 \u0627\u0632 &#8220;Commit C&#8221; \u0645\u0646\u0634\u0639\u0628 \u0634\u062f.  \u062a\u0648\u0633\u0639\u0647\u200c\u062f\u0647\u0646\u062f\u0647 \u062f\u06cc\u06af\u0631 \u0646\u0645\u06cc\u200c\u062f\u0627\u0646\u0633\u062a \u06a9\u0647 \u062f\u0631 \u0647\u0645\u06cc\u0646 \u062d\u06cc\u0646\u060c \u0645\u0646 \u0628\u0647 \u0635\u0648\u0631\u062a \u0645\u062d\u0644\u06cc \u0634\u0639\u0628\u0647\u200c\u0627\u0645 \u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u0645\u06cc\u200c\u062f\u0627\u062f\u0645 \u0648 \u0628\u0639\u062f\u0627\u064b \u062f\u0648\u0628\u0627\u0631\u0647 \u0622\u0646 \u0631\u0627 \u0641\u0634\u0627\u0631 \u0645\u06cc\u200c\u062f\u0627\u062f\u0645.<\/p>\n<p>\u0627\u06cc\u0646 \u0645\u0646\u062c\u0631 \u0628\u0647 \u06cc\u06a9 \u0646\u0627\u0633\u0627\u0632\u06af\u0627\u0631\u06cc \u0645\u06cc \u0634\u0648\u062f: \u062a\u0648\u0633\u0639\u0647 \u062f\u0647\u0646\u062f\u0647 \u062f\u06cc\u06af\u0631 \u0627\u0632 \u06cc\u06a9 commit \u06a9\u0627\u0631 \u0645\u06cc \u06a9\u0646\u062f \u06a9\u0647 \u062f\u06cc\u06af\u0631 \u062f\u0631 \u0646\u0633\u062e\u0647 \u0645\u062e\u0632\u0646 \u0645\u0646 \u0645\u0648\u062c\u0648\u062f \u0646\u06cc\u0633\u062a.<\/p>\n<p>\u0645\u0646 \u062f\u0631 \u0627\u06cc\u0646 \u0631\u0627\u0647\u0646\u0645\u0627 \u062f\u0631 \u0645\u0648\u0631\u062f \u0627\u06cc\u0646\u06a9\u0647 \u062f\u0642\u06cc\u0642\u0627\u064b \u0686\u0647 \u0686\u06cc\u0632\u06cc \u0628\u0627\u0639\u062b \u0627\u06cc\u0646 \u0645\u06cc \u0634\u0648\u062f \u062a\u0648\u0636\u06cc\u062d \u0646\u0645\u06cc \u062f\u0647\u0645\u060c \u0632\u06cc\u0631\u0627 \u067e\u06cc\u0627\u0645 \u0627\u0635\u0644\u06cc \u0645\u0646 \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0642\u0637\u0639\u0627\u064b \u0628\u0627\u06cc\u062f \u0627\u0632 \u0686\u0646\u06cc\u0646 \u0645\u0648\u0627\u0631\u062f\u06cc \u0627\u062c\u062a\u0646\u0627\u0628 \u06a9\u0646\u06cc\u062f.  \u0627\u06af\u0631 \u0628\u0647 \u0622\u0646\u0686\u0647 \u0648\u0627\u0642\u0639\u0627\u064b \u0627\u062a\u0641\u0627\u0642 \u0645\u06cc\u200c\u0627\u0641\u062a\u062f \u0639\u0644\u0627\u0642\u0647 \u062f\u0627\u0631\u06cc\u062f\u060c \u067e\u06cc\u0648\u0646\u062f\u06cc \u0628\u0647 \u06cc\u06a9 \u0645\u0646\u0628\u0639 \u0645\u0641\u06cc\u062f \u062f\u0631 \u0632\u06cc\u0631 \u0645\u06cc\u200c\u06af\u0630\u0627\u0631\u0645.  \u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631\u060c \u0627\u062c\u0627\u0632\u0647 \u062f\u0647\u06cc\u062f \u0622\u0646\u0686\u0647 \u0631\u0627 \u06a9\u0647 \u067e\u0648\u0634\u0634 \u062f\u0627\u062f\u0647 \u0627\u06cc\u0645\u060c \u062e\u0644\u0627\u0635\u0647 \u06a9\u0646\u06cc\u0645.<\/p>\n<h1 id=\"recap\"><span class=\"ez-toc-section\" id=\"%d8%ae%d9%84%d8%a7%d8%b5%d9%87\"><\/span>\u062e\u0644\u0627\u0635\u0647<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u062f\u0631 \u0627\u06cc\u0646 \u0622\u0645\u0648\u0632\u0634 \u0628\u0627 \u0627\u06cc\u0646 \u0645\u0648\u0636\u0648\u0639 \u0622\u0634\u0646\u0627 \u0634\u062f\u06cc\u062f <code>git rebase<\/code>\u060c \u0627\u0628\u0632\u0627\u0631\u06cc \u0641\u0648\u0642 \u0627\u0644\u0639\u0627\u062f\u0647 \u0642\u062f\u0631\u062a\u0645\u0646\u062f \u0628\u0631\u0627\u06cc \u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc \u062a\u0627\u0631\u06cc\u062e \u062f\u0631 Git.  \u0634\u0645\u0627 \u0686\u0646\u062f \u0645\u0648\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u06af\u0631\u0641\u062a\u06cc\u062f \u06a9\u0647 \u062f\u0631 \u0622\u0646 <code>git rebase<\/code> \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0645\u0641\u06cc\u062f \u0628\u0627\u0634\u062f\u060c \u0648 \u0646\u062d\u0648\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0622\u0646 \u0628\u0627 \u06cc\u06a9\u060c \u062f\u0648 \u06cc\u0627 \u0633\u0647 \u067e\u0627\u0631\u0627\u0645\u062a\u0631\u060c \u0628\u0627 \u0648 \u0628\u062f\u0648\u0646 \u0622\u0646 <code>--onto<\/code> \u062a\u0639\u0648\u06cc\u0636.<\/p>\n<p>\u0627\u0645\u06cc\u062f\u0648\u0627\u0631\u0645 \u062a\u0648\u0646\u0633\u062a\u0647 \u0628\u0627\u0634\u0645 \u0634\u0645\u0627 \u0631\u0648 \u0645\u062a\u0642\u0627\u0639\u062f \u06a9\u0646\u0645 <code>git rebase<\/code> \u0642\u062f\u0631\u062a\u0645\u0646\u062f \u0627\u0633\u062a \u2013 \u0627\u0645\u0627 \u0627\u06cc\u0646 \u06a9\u0647 \u067e\u0633 \u0627\u0632 \u062f\u0631\u06cc\u0627\u0641\u062a \u0627\u0635\u0644 \u0645\u0637\u0644\u0628 \u0628\u0633\u06cc\u0627\u0631 \u0633\u0627\u062f\u0647 \u0627\u0633\u062a.  \u0627\u06cc\u0646 \u0627\u0628\u0632\u0627\u0631\u06cc \u0628\u0631\u0627\u06cc &#8220;\u06a9\u067e\u06cc \u067e\u06cc\u0633\u062a&#8221; commit \u0647\u0627 (\u06cc\u0627 \u062f\u0642\u06cc\u0642 \u062a\u0631\u060c \u0648\u0635\u0644\u0647 \u0647\u0627) \u0627\u0633\u062a.  \u0648 \u0627\u06cc\u0646 \u0627\u0628\u0632\u0627\u0631 \u0645\u0641\u06cc\u062f\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0628\u0627\u06cc\u062f \u062f\u0631 \u0632\u06cc\u0631 \u06a9\u0645\u0631\u0628\u0646\u062f \u062e\u0648\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f.<\/p>\n<h1 id=\"additional-references\"><span class=\"ez-toc-section\" id=\"%d9%85%d8%b1%d8%a7%d8%ac%d8%b9_%d8%a7%d8%b6%d8%a7%d9%81%db%8c\"><\/span>\u0645\u0631\u0627\u062c\u0639 \u0627\u0636\u0627\u0641\u06cc<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<ul>\n<li>\u0644\u06cc\u0633\u062a \u067e\u062e\u0634 Git Internals YouTube \u2014 \u062a\u0648\u0633\u0637 Brief (\u06a9\u0627\u0646\u0627\u0644 YouTube \u0645\u0646).<\/li>\n<li>\u067e\u0633\u062a \u0642\u0628\u0644\u06cc Omer \u062f\u0631 \u0645\u0648\u0631\u062f \u062f\u0627\u062e\u0644\u06cc Git.<\/li>\n<li>\u0622\u0645\u0648\u0632\u0634 Omer \u062f\u0631\u0628\u0627\u0631\u0647 Git UNDO &#8211; \u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u0628\u0627 Git.<\/li>\n<li>Git docs \u062f\u0631 rebasing<\/li>\n<li>\u0627\u0646\u0634\u0639\u0627\u0628 \u0648 \u0642\u062f\u0631\u062a rebase<\/li>\n<li>Rebasing \u062a\u0639\u0627\u0645\u0644\u06cc<\/li>\n<li>Git rebase &#8211;onto<\/li>\n<\/ul>\n<h1 id=\"about-the-author\"><span class=\"ez-toc-section\" id=\"%d8%af%d8%b1%d8%a8%d8%a7%d8%b1%d9%87_%d9%86%d9%88%db%8c%d8%b3%d9%86%d8%af%d9%87\"><\/span><strong><strong><strong>\u062f\u0631\u0628\u0627\u0631\u0647 \u0646\u0648\u06cc\u0633\u0646\u062f\u0647<\/strong><\/strong><\/strong><span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>Omer Rosenbaum \u0645\u062f\u06cc\u0631 \u0627\u0631\u0634\u062f \u0641\u0646\u0627\u0648\u0631\u06cc Swimm \u0627\u0633\u062a.  \u0627\u0648 \u0646\u0648\u06cc\u0633\u0646\u062f\u0647 \u06a9\u0627\u0646\u0627\u0644 \u06a9\u0648\u062a\u0627\u0647 \u06cc\u0648\u062a\u06cc\u0648\u0628 \u0627\u0633\u062a.  \u0627\u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u06a9\u0627\u0631\u0634\u0646\u0627\u0633 \u0622\u0645\u0648\u0632\u0634 \u0633\u0627\u06cc\u0628\u0631\u06cc \u0648 \u0628\u0646\u06cc\u0627\u0646\u06af\u0630\u0627\u0631 \u0622\u06a9\u0627\u062f\u0645\u06cc \u0627\u0645\u0646\u06cc\u062a\u06cc \u0686\u06a9 \u067e\u0648\u06cc\u0646\u062a \u0627\u0633\u062a.  \u0627\u0648 \u0646\u0648\u06cc\u0633\u0646\u062f\u0647 \u0634\u0628\u06a9\u0647 \u0647\u0627\u06cc \u06a9\u0627\u0645\u067e\u06cc\u0648\u062a\u0631\u06cc (\u0628\u0647 \u0632\u0628\u0627\u0646 \u0639\u0628\u0631\u06cc) \u0627\u0633\u062a.  \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0648 \u0631\u0627 \u062f\u0631 \u0622\u0646 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u06cc\u062f <a href=\"https:\/\/twitter.com\/Omer_Ros\" target=\"_blank\" rel=\"noopener\">\u062a\u0648\u06cc\u06cc\u062a\u0631<\/a>.<\/p>\n<\/section>\n<p><script async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"><\/script><br \/>\n<br \/><br \/>\n<br \/>\u0645\u0646\u062a\u0634\u0631 \u0634\u062f\u0647 \u062f\u0631 1402-12-26 05:50:06<br \/>\n<\/p>\n\n\n<div class=\"kk-star-ratings kksr-auto kksr-align-center kksr-valign-bottom\"\n    data-payload='{&quot;align&quot;:&quot;center&quot;,&quot;id&quot;:&quot;9170&quot;,&quot;slug&quot;:&quot;default&quot;,&quot;valign&quot;:&quot;bottom&quot;,&quot;ignore&quot;:&quot;&quot;,&quot;reference&quot;:&quot;auto&quot;,&quot;class&quot;:&quot;&quot;,&quot;count&quot;:&quot;0&quot;,&quot;legendonly&quot;:&quot;&quot;,&quot;readonly&quot;:&quot;&quot;,&quot;score&quot;:&quot;0&quot;,&quot;starsonly&quot;:&quot;&quot;,&quot;best&quot;:&quot;5&quot;,&quot;gap&quot;:&quot;5&quot;,&quot;greet&quot;:&quot;\u0627\u0645\u062a\u06cc\u0627\u0632 \u0634\u0645\u0627 \u0628\u0647 \u0627\u06cc\u0646 \u0645\u0637\u0644\u0628&quot;,&quot;legend&quot;:&quot;0\\\/5 (0 \u0631\u0627\u06cc)&quot;,&quot;size&quot;:&quot;30&quot;,&quot;title&quot;:&quot;\u06a9\u062a\u0627\u0628 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc Git Rebase \u2013 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc \u0642\u0637\u0639\u06cc \u0628\u0631\u0627\u06cc Rebasing&quot;,&quot;width&quot;:&quot;0&quot;,&quot;_legend&quot;:&quot;{score}\\\/{best} ({count} \u0631\u0627\u06cc)&quot;,&quot;font_factor&quot;:&quot;1.25&quot;}'>\n            \n<div class=\"kksr-stars\">\n    \n<div class=\"kksr-stars-inactive\">\n            <div class=\"kksr-star\" data-star=\"1\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" data-star=\"2\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" data-star=\"3\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" data-star=\"4\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" data-star=\"5\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n    <\/div>\n    \n<div class=\"kksr-stars-active\" style=\"width: 0px;\">\n            <div class=\"kksr-star\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n            <div class=\"kksr-star\" style=\"padding-left: 5px\">\n            \n\n<div class=\"kksr-icon\" style=\"width: 30px; height: 30px;\"><\/div>\n        <\/div>\n    <\/div>\n<\/div>\n                \n\n<div class=\"kksr-legend\" style=\"font-size: 24px;\">\n            <span class=\"kksr-muted\">\u0627\u0645\u062a\u06cc\u0627\u0632 \u0634\u0645\u0627 \u0628\u0647 \u0627\u06cc\u0646 \u0645\u0637\u0644\u0628<\/span>\n    <\/div>\n    <\/div>\n","protected":false},"excerpt":{"rendered":"<p><span class=\"span-reading-time rt-reading-time\" style=\"display: block;\"><span class=\"rt-label rt-prefix\">\u0632\u0645\u0627\u0646 \u0644\u0627\u0632\u0645 \u0628\u0631\u0627\u06cc \u0645\u0637\u0627\u0644\u0639\u0647: <\/span> <span class=\"rt-time\"> 17<\/span> <span class=\"rt-label rt-postfix\">\u062f\u0642\u06cc\u0642\u0647<\/span><\/span>\u06cc\u06a9\u06cc \u0627\u0632 \u0642\u062f\u0631\u062a\u0645\u0646\u062f\u062a\u0631\u06cc\u0646 \u0627\u0628\u0632\u0627\u0631\u0647\u0627\u06cc\u06cc \u06a9\u0647 \u06cc\u06a9 \u062a\u0648\u0633\u0639\u0647 \u062f\u0647\u0646\u062f\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u062f\u0631 \u062c\u0639\u0628\u0647 \u0627\u0628\u0632\u0627\u0631 \u062e\u0648\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f \u0627\u06cc\u0646 \u0627\u0633\u062a git rebase. \u0628\u0627 \u0627\u06cc\u0646 \u062d\u0627\u0644\u060c \u0628\u0647 \u062f\u0644\u06cc\u0644 \u067e\u06cc\u0686\u06cc\u062f\u0647 \u0628\u0648\u062f\u0646 \u0648 \u0633\u0648\u0621 \u062a\u0641\u0627\u0647\u0645 \u0628\u062f\u0646\u0627\u0645 \u0627\u0633\u062a. \u062d\u0642\u06cc\u0642\u062a \u0627\u06cc\u0646 \u0627\u0633\u062a\u060c \u0627\u06af\u0631 \u0645\u062a\u0648\u062c\u0647 \u0634\u0648\u06cc\u062f \u06a9\u0647 \u0622\u0646 \u0686\u06cc\u0633\u062a \u062f\u0631 \u062d\u0642\u06cc\u0642\u062a \u0645\u06cc\u06a9\u0646\u062f\u060c git rebase \u0627\u0628\u0632\u0627\u0631\u06cc \u0628\u0633\u06cc\u0627\u0631 \u0632\u06cc\u0628\u0627 \u0648 \u0633\u0627\u062f\u0647 \u0628\u0631\u0627\u06cc \u062f\u0633\u062a\u06cc\u0627\u0628\u06cc \u0628\u0647 \u0645\u0648\u0627\u0631\u062f [&hellip;]<\/p>\n","protected":false},"author":6,"featured_media":9171,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1726,620,206],"tags":[498,1994,1997,1999,1947,1948,1814,1759,1416,1998,1996,1995,1946,1940],"class_list":{"0":"post-9170","1":"post","2":"type-post","3":"status-publish","4":"format-standard","5":"has-post-thumbnail","6":"hentry","7":"category-devops","8":"category-programming","9":"category-development","10":"tag-git","11":"tag-git-hosting","12":"tag-rebase","13":"tag-rebasing","14":"tag--git","15":"tag-1948","16":"tag-1814","17":"tag-1759","18":"tag---gitlab","19":"tag-1998","20":"tag-1996","21":"tag-1995","23":"tag-1940"},"acf":[],"_links":{"self":[{"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/posts\/9170","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/users\/6"}],"replies":[{"embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/comments?post=9170"}],"version-history":[{"count":0,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/posts\/9170\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/media\/9171"}],"wp:attachment":[{"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/media?parent=9170"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/categories?post=9170"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/tags?post=9170"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}