{"id":9723,"date":"2023-12-26T16:07:26","date_gmt":"2023-12-26T12:37:26","guid":{"rendered":"https:\/\/rasanegar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/"},"modified":"2023-12-26T16:07:26","modified_gmt":"2023-12-26T12:37:26","slug":"git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86","status":"publish","type":"post","link":"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/","title":{"rendered":"Git Diff and Patch \u2013 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc \u06a9\u0627\u0645\u0644 \u0628\u0631\u0627\u06cc \u062a\u0648\u0633\u0639\u0647 \u062f\u0647\u0646\u062f\u06af\u0627\u0646"},"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 ' ><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-1\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%d8%aa%d8%a7%d8%b1%db%8c%d8%ae%da%86%d9%87_git_diff_%f0%9f%93%96\" >\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 Git Diff \ud83d\udcd6<\/a><\/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\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%d8%b2%d9%85%d8%a7%d9%86_%d8%af%d8%b3%d8%aa_%d8%a8%d9%87_%d8%af%d8%b3%d8%aa_%d8%b4%d8%af%d9%86_%d8%a7%d8%b3%d8%aa_%f0%9f%99%8c%f0%9f%8f%bb\" >\u0632\u0645\u0627\u0646 \u062f\u0633\u062a \u0628\u0647 \u062f\u0633\u062a \u0634\u062f\u0646 \u0627\u0633\u062a \ud83d\ude4c\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-3\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%d8%b3%d8%a7%d8%ae%d8%aa%d8%a7%d8%b1_%db%8c%da%a9_%d8%aa%d9%81%d8%a7%d9%88%d8%aa_%f0%9f%94%8d\" >\u0633\u0627\u062e\u062a\u0627\u0631 \u06cc\u06a9 \u062a\u0641\u0627\u0648\u062a \ud83d\udd0d<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-4\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%d9%86%d8%ad%d9%88%d9%87_%d8%aa%d9%88%d9%84%db%8c%d8%af_%d8%aa%d9%81%d8%a7%d9%88%d8%aa_%d9%87%d8%a7_%e2%8c%a8%ef%b8%8f\" >\u0646\u062d\u0648\u0647 \u062a\u0648\u0644\u06cc\u062f \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u2328\ufe0f<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-5\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%d9%86%d8%ad%d9%88%d9%87_%d8%a7%d8%b9%d9%85%d8%a7%d9%84_%d9%be%da%86_%d9%87%d8%a7_%f0%9f%92%aa%f0%9f%8f%bb\" >\u0646\u062d\u0648\u0647 \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0647\u0627 \ud83d\udcaa\ud83c\udffb<\/a><ul class='ez-toc-list-level-3' ><li class='ez-toc-heading-level-3'><a class=\"ez-toc-link ez-toc-heading-6\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%db%8c%d8%a7%d8%af%d8%af%d8%a7%d8%b4%d8%aa_%d8%aa%d8%a7%d8%b1%db%8c%d8%ae%db%8c_%f0%9f%93%94\" >\u06cc\u0627\u062f\u062f\u0627\u0634\u062a \u062a\u0627\u0631\u06cc\u062e\u06cc \ud83d\udcd4<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-3'><a class=\"ez-toc-link ez-toc-heading-7\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%db%8c%da%a9_%d8%af%d8%b1%d8%ae%d9%88%d8%a7%d8%b3%d8%aa_%d8%b3%d8%a7%d8%af%d9%87\" >\u06cc\u06a9 \u062f\u0631\u062e\u0648\u0627\u0633\u062a \u0633\u0627\u062f\u0647<\/a><\/li><\/ul><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-8\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%d8%af%d8%b1%da%a9_%d8%ae%d8%b7%d9%88%d8%b7_%d8%b2%d9%85%db%8c%d9%86%d9%87_%f0%9f%a7%91%f0%9f%8f%bb%e2%80%8d%f0%9f%8f%ab\" >\u062f\u0631\u06a9 \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \ud83e\uddd1\ud83c\udffb\u200d\ud83c\udfeb<\/a><\/li><\/ul><\/li><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-9\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%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-10\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%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><li class='ez-toc-page-1 ez-toc-heading-level-1'><a class=\"ez-toc-link ez-toc-heading-11\" href=\"https:\/\/rasanegaar.com\/blog\/git-diff-and-patch-%d8%b1%d8%a7%d9%87%d9%86%d9%85%d8%a7%db%8c-%da%a9%d8%a7%d9%85%d9%84-%d8%a8%d8%b1%d8%a7%db%8c-%d8%aa%d9%88%d8%b3%d8%b9%d9%87-%d8%af%d9%87%d9%86%d8%af%da%af%d8%a7%d9%86\/#%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><\/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\"> 15<\/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>\u0628\u0633\u06cc\u0627\u0631\u06cc \u0627\u0632 \u0641\u0631\u0622\u06cc\u0646\u062f\u0647\u0627\u06cc \u062c\u0627\u0644\u0628 \u062f\u0631 Git \u0645\u0627\u0646\u0646\u062f \u0627\u062f\u063a\u0627\u0645\u060c rebasing \u06cc\u0627 \u062d\u062a\u06cc committing \u0628\u0631 \u0627\u0633\u0627\u0633 \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u0648 \u0648\u0635\u0644\u0647 \u0647\u0627 \u0647\u0633\u062a\u0646\u062f.<\/p>\n<p>\u062a\u0648\u0633\u0639\u0647\u200c\u062f\u0647\u0646\u062f\u06af\u0627\u0646 \u0647\u0645\u06cc\u0634\u0647 \u0628\u0627 \u062a\u0641\u0627\u0648\u062a\u200c\u0647\u0627 \u06a9\u0627\u0631 \u0645\u06cc\u200c\u06a9\u0646\u0646\u062f\u060c \u0686\u0647 \u0645\u0633\u062a\u0642\u06cc\u0645\u0627\u064b \u0627\u0632 Git \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f \u0648 \u0686\u0647 \u0628\u0627 \u062a\u06a9\u06cc\u0647 \u0628\u0631 \u0646\u0645\u0627\u06cc \u062a\u0641\u0627\u0648\u062a IDE.  \u062f\u0631 \u0627\u06cc\u0646 \u067e\u0633\u062a\u060c \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u0648 \u067e\u0686 \u0647\u0627\u06cc Git \u0686\u06cc\u0633\u062a\u060c \u0633\u0627\u062e\u062a\u0627\u0631 \u0622\u0646\u0647\u0627 \u0648 \u0646\u062d\u0648\u0647 \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0647\u0627 \u0631\u0627 \u062e\u0648\u0627\u0647\u06cc\u062f \u0622\u0645\u0648\u062e\u062a.<\/p>\n<p>\u062f\u0631 \u067e\u0633\u062a \u0642\u0628\u0644\u06cc \u0628\u0627 \u0622\u0628\u062c\u06a9\u062a \u0647\u0627\u06cc \u06af\u06cc\u062a \u0622\u0634\u0646\u0627 \u0634\u062f\u06cc\u062f.  \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635\u060c \u0645\u0627 \u0628\u062d\u062b \u06a9\u0631\u062f\u06cc\u0645 \u06a9\u0647 \u06cc\u06a9 commit \u06cc\u06a9 \u0639\u06a9\u0633 \u0641\u0648\u0631\u06cc \u0627\u0632 \u062f\u0631\u062e\u062a \u06a9\u0627\u0631 \u062f\u0631 \u06cc\u06a9 \u0646\u0642\u0637\u0647 \u062e\u0627\u0635 \u0627\u0632 \u0632\u0645\u0627\u0646\u060c \u0639\u0644\u0627\u0648\u0647 \u0628\u0631 \u0628\u0631\u062e\u06cc \u0645\u062a\u0627 \u062f\u0627\u062f\u0647 \u0647\u0627 \u0627\u0633\u062a.<\/p>\n<p>\u0628\u0627 \u0627\u06cc\u0646 \u062d\u0627\u0644\u060c \u062f\u0631\u06a9 \u062a\u0639\u0647\u062f\u0627\u062a \u0641\u0631\u062f\u06cc \u0628\u0627 \u0646\u06af\u0627\u0647 \u06a9\u0631\u062f\u0646 \u0628\u0647 \u06a9\u0644 \u062f\u0631\u062e\u062a \u06a9\u0627\u0631 \u0648\u0627\u0642\u0639\u0627\u064b \u062f\u0634\u0648\u0627\u0631 \u0627\u0633\u062a.  \u062f\u0631 \u0639\u0648\u0636\u060c \u0646\u06af\u0627\u0647 \u06a9\u0631\u062f\u0646 \u0628\u0647 \u062a\u0641\u0627\u0648\u062a \u06cc\u06a9 commit \u0628\u0627 commit \u0648\u0627\u0644\u062f\u0634 \u0645\u0641\u06cc\u062f\u062a\u0631 \u0627\u0633\u062a\u060c \u06cc\u0639\u0646\u06cc <strong>\u062a\u0641\u0627\u0648\u062a <\/strong> \u0628\u06cc\u0646 \u0627\u06cc\u0646 \u062a\u0639\u0647\u062f\u0627\u062a<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u0648\u0642\u062a\u06cc \u0645\u06cc \u06af\u0648\u06cc\u0645 \u0645\u0646\u0638\u0648\u0631\u0645 \u0686\u06cc\u0633\u062a\u061f <code>diff<\/code>?  \u0628\u06cc\u0627\u06cc\u06cc\u062f \u0628\u0627 \u06a9\u0645\u06cc \u062a\u0627\u0631\u06cc\u062e \u0634\u0631\u0648\u0639 \u06a9\u0646\u06cc\u0645.<\/p>\n<h1 id=\"git-diff-s-history-\"><span class=\"ez-toc-section\" id=\"%d8%aa%d8%a7%d8%b1%db%8c%d8%ae%da%86%d9%87_git_diff_%f0%9f%93%96\"><\/span>\u062a\u0627\u0631\u06cc\u062e\u0686\u0647 Git Diff \ud83d\udcd6<span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>Git&#8217;s <code>diff<\/code> \u0628\u0631 \u0627\u0633\u0627\u0633 \u0627\u0628\u0632\u0627\u0631 \u062a\u0641\u0627\u0648\u062a \u062f\u0631 \u0633\u06cc\u0633\u062a\u0645 \u0647\u0627\u06cc \u06cc\u0648\u0646\u06cc\u06a9\u0633 \u0627\u0633\u062a. <code>diff<\/code> \u062f\u0631 \u0627\u0648\u0627\u06cc\u0644 \u062f\u0647\u0647 1970 \u0628\u0631 \u0631\u0648\u06cc \u0633\u06cc\u0633\u062a\u0645 \u0639\u0627\u0645\u0644 \u06cc\u0648\u0646\u06cc\u06a9\u0633 \u062a\u0648\u0633\u0639\u0647 \u06cc\u0627\u0641\u062a.  \u0627\u0648\u0644\u06cc\u0646 \u0646\u0633\u062e\u0647 \u0645\u0646\u062a\u0634\u0631 \u0634\u062f\u0647 \u0628\u0627 \u0646\u0633\u062e\u0647 \u067e\u0646\u062c\u0645 \u06cc\u0648\u0646\u06cc\u06a9\u0633 \u062f\u0631 \u0633\u0627\u0644 1974 \u0639\u0631\u0636\u0647 \u0634\u062f.<\/p>\n<p><code>git diff<\/code>  \u062f\u0633\u062a\u0648\u0631\u06cc \u0627\u0633\u062a \u06a9\u0647 \u062f\u0648 \u0648\u0631\u0648\u062f\u06cc \u0645\u06cc \u06af\u06cc\u0631\u062f \u0648 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0622\u0646\u0647\u0627 \u0631\u0627 \u0645\u062d\u0627\u0633\u0628\u0647 \u0645\u06cc \u06a9\u0646\u062f.  \u0648\u0631\u0648\u062f\u06cc\u200c\u0647\u0627 \u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u0646\u062f commit \u0628\u0627\u0634\u0646\u062f\u060c \u0627\u0645\u0627 \u0647\u0645\u0686\u0646\u06cc\u0646 \u0641\u0627\u06cc\u0644\u200c\u0647\u0627\u06cc\u06cc \u0648 \u062d\u062a\u06cc \u0641\u0627\u06cc\u0644\u200c\u0647\u0627\u06cc\u06cc \u06a9\u0647 \u0647\u0631\u06af\u0632 \u0628\u0647 \u0645\u062e\u0632\u0646 \u0645\u0639\u0631\u0641\u06cc \u0646\u0634\u062f\u0647\u200c\u0627\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-214.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-214\" width=\"656\" height=\"115\" loading=\"lazy\" title=\"\"><figcaption>Git diff \u062f\u0648 \u0648\u0631\u0648\u062f\u06cc \u0645\u06cc \u06af\u06cc\u0631\u062f \u06a9\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u062f commit \u06cc\u0627 \u0641\u0627\u06cc\u0644 \u0628\u0627\u0634\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0627\u06cc\u0646 \u0645\u0647\u0645 \u0627\u0633\u062a &#8211; <code>git diff<\/code> \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u062f\u0648 \u0631\u0634\u062a\u0647 \u0631\u0627 \u0645\u062d\u0627\u0633\u0628\u0647 \u0645\u06cc \u06a9\u0646\u062f\u060c \u06a9\u0647 \u0627\u063a\u0644\u0628 \u0627\u0648\u0642\u0627\u062a \u0627\u0632 \u06a9\u062f \u062a\u0634\u06a9\u06cc\u0644 \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u0627\u0645\u0627 \u0646\u0647 \u0644\u0632\u0648\u0645\u0627.<\/p>\n<h1 id=\"time-to-get-hands-on-\"><span class=\"ez-toc-section\" id=\"%d8%b2%d9%85%d8%a7%d9%86_%d8%af%d8%b3%d8%aa_%d8%a8%d9%87_%d8%af%d8%b3%d8%aa_%d8%b4%d8%af%d9%86_%d8%a7%d8%b3%d8%aa_%f0%9f%99%8c%f0%9f%8f%bb\"><\/span><strong>\u0632\u0645\u0627\u0646 \u062f\u0633\u062a \u0628\u0647 \u062f\u0633\u062a \u0634\u062f\u0646 \u0627\u0633\u062a \ud83d\ude4c\ud83c\udffb<\/strong><span class=\"ez-toc-section-end\"><\/span><\/h1>\n<p>\u0628\u0647 \u0634\u0645\u0627 \u062a\u0648\u0635\u06cc\u0647 \u0645\u06cc \u0634\u0648\u062f \u0647\u0646\u06af\u0627\u0645 \u062e\u0648\u0627\u0646\u062f\u0646 \u0627\u06cc\u0646 \u067e\u0633\u062a\u060c \u062f\u0633\u062a\u0648\u0631\u0627\u062a \u0631\u0627 \u062e\u0648\u062f\u062a\u0627\u0646 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0645\u062a\u0646\u06cc \u0628\u0633\u06cc\u0627\u0631 \u06a9\u0648\u062a\u0627\u0647 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f \u06a9\u0647 \u0646\u0627\u0645 \u062f\u0627\u0631\u062f <code>file.txt<\/code> \u062f\u0631 \u062f\u0633\u062a\u06af\u0627\u0647 \u0645\u0646 \u06a9\u0647 \u0627\u0632 6 \u062e\u0637 \u062a\u0634\u06a9\u06cc\u0644 \u0634\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-158.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-158\" width=\"296\" height=\"125\" loading=\"lazy\" title=\"\"><figcaption><code>file.txt<\/code>  \u0634\u0627\u0645\u0644 6 \u062e\u0637 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062d\u0627\u0644\u0627 \u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u06a9\u0645\u06cc \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u06cc\u062f.  \u062e\u0637 \u062f\u0648\u0645 \u0631\u0627 \u0628\u0631\u062f\u0627\u0631\u06cc\u062f \u0648 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u062e\u0637 \u0686\u0647\u0627\u0631\u0645 \u0648\u0627\u0631\u062f \u06a9\u0646\u06cc\u062f.  \u06cc\u06a9 \u0631\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f <code>!<\/code> \u062a\u0627 \u0627\u0646\u062a\u0647\u0627\u06cc \u062e\u0637 \u0622\u062e\u0631\u060c \u0628\u0647 \u0627\u06cc\u0646 \u0646\u062a\u06cc\u062c\u0647 \u0645\u06cc \u0631\u0633\u06cc\u062f:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-159.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-159\" width=\"306\" height=\"109\" loading=\"lazy\" title=\"\"><figcaption>\u067e\u0633 \u0627\u0632 \u0627\u0635\u0644\u0627\u062d <code>file.txt<\/code>\u060c 6 \u062e\u0637 \u0645\u062e\u062a\u0644\u0641 \u062f\u0631\u06cc\u0627\u0641\u062a \u0645\u06cc \u06a9\u0646\u06cc\u0645 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0628\u0627 \u06cc\u06a9 \u0646\u0627\u0645 \u062c\u062f\u06cc\u062f \u0630\u062e\u06cc\u0631\u0647 \u06a9\u0646\u06cc\u062f\u060c \u0628\u06af\u0648\u06cc\u06cc\u062f <code>new_file.txt<\/code>.<\/p>\n<p>\u062d\u0627\u0644\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u0645 <code>git diff<\/code> \u0628\u0631\u0627\u06cc \u0645\u062d\u0627\u0633\u0628\u0647 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0647\u0627 \u0645\u0627\u0646\u0646\u062f \u0632\u06cc\u0631:<\/p>\n<p><code>git diff -\u2013no-index file.txt new_file.txt<\/code><\/p>\n<p>(\u0645\u0646 \u062a\u0648\u0636\u06cc\u062d \u062e\u0648\u0627\u0647\u0645 \u062f\u0627\u062f <code>--no-index<\/code> \u0628\u0639\u062f\u0627\u064b \u0627\u06cc\u0646 \u062f\u0633\u062a\u0648\u0631 \u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u06cc\u062f.)<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-160.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-160\" width=\"239\" height=\"198\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff<\/code> \u062e\u06cc\u0644\u06cc \u0686\u06cc\u0632\u0647\u0627 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f<\/p>\n<p>\u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631\u060c \u0631\u0648\u06cc \u0642\u0633\u0645\u062a\u06cc \u06a9\u0647 \u0628\u0627 \u0622\u0646 \u0634\u0631\u0648\u0639 \u0645\u06cc \u0634\u0648\u062f \u062a\u0645\u0631\u06a9\u0632 \u06a9\u0646\u06cc\u062f <code>This is a simple line<\/code>.  \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0628\u06cc\u0646\u06cc\u062f \u06a9\u0647 \u062e\u0637 \u0627\u0636\u0627\u0641\u0647 \u0634\u062f\u0647 (<code>\/\/ new test<\/code>) \u0642\u0628\u0644 \u0627\u0632 a <code>+<\/code> \u0627\u0645\u0636\u0627 \u06a9\u0631\u062f\u0646.  \u062e\u0637 \u062d\u0630\u0641 \u0634\u062f\u0647 \u0642\u0628\u0644 \u0627\u0632 a \u0627\u0633\u062a <code>-<\/code> \u0627\u0645\u0636\u0627 \u06a9\u0631\u062f\u0646.<\/p>\n<p>\u062c\u0627\u0644\u0628 \u062a\u0648\u062c\u0647 \u0627\u0633\u062a\u060c \u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 Git \u06cc\u06a9 \u062e\u0637 \u0627\u0635\u0644\u0627\u062d \u0634\u062f\u0647 \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u062f\u0646\u0628\u0627\u0644\u0647 \u0627\u06cc \u0627\u0632 \u062f\u0648 \u062a\u063a\u06cc\u06cc\u0631 \u0645\u0634\u0627\u0647\u062f\u0647 \u0645\u06cc \u06a9\u0646\u062f &#8211; \u06cc\u06a9 \u062e\u0637 \u0631\u0627 \u067e\u0627\u06a9 \u0645\u06cc \u06a9\u0646\u062f \u0648 \u0628\u0647 \u062c\u0627\u06cc \u0622\u0646 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u0627\u0636\u0627\u0641\u0647 \u0645\u06cc \u06a9\u0646\u062f.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u067e\u0686 \u0634\u0627\u0645\u0644 \u062d\u0630\u0641 \u0622\u062e\u0631\u06cc\u0646 \u062e\u0637 \u0648 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u06a9\u0647 \u0628\u0631\u0627\u0628\u0631 \u0628\u0627 \u0622\u0646 \u062e\u0637 \u0627\u0633\u062a\u060c \u0628\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u06cc\u06a9 <code>!<\/code>.<\/p>\n<p><!--kg-card-end: markdown--><\/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-165.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-165\" width=\"234\" height=\"118\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0637\u0648\u0637 \u0627\u0636\u0627\u0641\u0647 \u0642\u0628\u0644 \u0627\u0632 <code>+<\/code>\u060c \u062d\u0630\u0641 \u062e\u0637\u0648\u0637 \u062a\u0648\u0633\u0637 <code>-<\/code>\u060c \u0648 \u062e\u0637\u0648\u0637 \u0627\u0635\u0644\u0627\u062d \u062f\u0646\u0628\u0627\u0644\u0647 \u0627\u06cc \u0627\u0632 \u062d\u0630\u0641 \u0647\u0627 \u0648 \u0627\u0636\u0627\u0641\u0627\u062a \u0647\u0633\u062a\u0646\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0634\u0631\u0627\u06cc\u0637 <code>patch<\/code> \u0648 <code>diff<\/code> \u0627\u063a\u0644\u0628 \u0628\u0647 \u062c\u0627\u06cc \u06cc\u06a9\u062f\u06cc\u06af\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u0634\u0648\u0646\u062f\u060c \u0627\u06af\u0631\u0686\u0647 \u062d\u062f\u0627\u0642\u0644 \u0627\u0632 \u0646\u0638\u0631 \u062a\u0627\u0631\u06cc\u062e\u06cc \u062a\u0645\u0627\u06cc\u0632\u06cc \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f.<\/p>\n<p>\u0622 <code>diff<\/code> \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u062f\u0648 \u0641\u0627\u06cc\u0644 \u06cc\u0627 \u0639\u06a9\u0633 \u0641\u0648\u0631\u06cc \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f \u0648 \u062f\u0631 \u0627\u0646\u062c\u0627\u0645 \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0628\u0633\u06cc\u0627\u0631 \u06a9\u0645 \u0628\u0627\u0634\u062f.  \u0622 <code>patch<\/code> \u067e\u0633\u0648\u0646\u062f \u0627\u0644\u0641 \u0627\u0633\u062a <code>diff<\/code>\u060c \u0628\u0627 \u0627\u0637\u0644\u0627\u0639\u0627\u062a \u0628\u06cc\u0634\u062a\u0631 \u0645\u0627\u0646\u0646\u062f \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0648 \u0646\u0627\u0645 \u0641\u0627\u06cc\u0644 \u0647\u0627\u060c \u06a9\u0647 \u0628\u0647 \u0622\u0646 \u0627\u062c\u0627\u0632\u0647 \u0645\u06cc \u062f\u0647\u062f \u062a\u0627 \u0628\u0647 \u0637\u0648\u0631 \u06af\u0633\u062a\u0631\u062f\u0647 \u062a\u0631 \u0627\u0639\u0645\u0627\u0644 \u0634\u0648\u062f\u060c \u0627\u0641\u0632\u0648\u062f\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a.  \u0627\u06cc\u0646 \u06cc\u06a9 \u0633\u0646\u062f \u0645\u062a\u0646\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0646\u062d\u0648\u0647 \u062a\u063a\u06cc\u06cc\u0631 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u06cc\u0627 \u067e\u0627\u06cc\u06af\u0627\u0647 \u06a9\u062f \u0645\u0648\u062c\u0648\u062f \u0631\u0627 \u062a\u0648\u0636\u06cc\u062d \u0645\u06cc \u062f\u0647\u062f.<\/p>\n<p>\u0627\u06cc\u0646 \u0631\u0648\u0632\u0647\u0627 \u0628\u0631\u0646\u0627\u0645\u0647 Unix diff \u0648 <code>git diff<\/code>\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u062a\u06a9\u0647 \u0647\u0627\u06cc\u06cc \u062f\u0631 \u0627\u0646\u0648\u0627\u0639 \u0645\u062e\u062a\u0644\u0641 \u062a\u0648\u0644\u06cc\u062f \u06a9\u0646\u062f.<\/p>\n<p>\u0622 <code>patch<\/code> \u06cc\u06a9 \u0646\u0645\u0627\u06cc\u0634 \u0641\u0634\u0631\u062f\u0647 \u0627\u0632 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u062f\u0648 \u0641\u0627\u06cc\u0644 \u0627\u0633\u062a.  \u0646\u062d\u0648\u0647 \u062a\u0628\u062f\u06cc\u0644 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0628\u0647 \u0641\u0627\u06cc\u0644 \u062f\u06cc\u06af\u0631 \u0631\u0627 \u062a\u0648\u0636\u06cc\u062d \u0645\u06cc \u062f\u0647\u062f.<\/p>\n<p>\u06cc\u0639\u0646\u06cc \u0627\u06af\u0631 \u00ab\u062f\u0633\u062a\u0648\u0631\u0627\u0644\u0639\u0645\u0644\u200c\u0647\u0627\u06cc\u00bb \u062a\u0648\u0644\u06cc\u062f \u0634\u062f\u0647 \u062a\u0648\u0633\u0637 \u0631\u0627 \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u06cc\u062f <code>git diff<\/code> \u0628\u0631 <code>file.txt<\/code> \u2013 \u06cc\u0639\u0646\u06cc \u062e\u0637 \u062f\u0648\u0645 \u0631\u0627 \u0628\u0631\u062f\u0627\u0631\u06cc\u062f\u060c \u0648\u0627\u0631\u062f \u06a9\u0646\u06cc\u062f <code>\/\/ new text<\/code> \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u062e\u0637 \u0686\u0647\u0627\u0631\u0645\u060c \u0648 \u062f\u06cc\u06af\u0631\u06cc \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f <code>!<\/code> \u062a\u0627 \u0622\u062e\u0631\u06cc\u0646 \u062e\u0637 &#8211; \u0634\u0645\u0627 \u0645\u062d\u062a\u0648\u0627\u06cc \u0622\u0646 \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f <code>new_file.txt<\/code>.<\/p>\n<p>\u0646\u06a9\u062a\u0647 \u0645\u0647\u0645 \u062f\u06cc\u06af\u0631\u06cc \u06a9\u0647 \u0628\u0627\u06cc\u062f \u0628\u0647 \u0622\u0646 \u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 \u06cc\u06a9 \u067e\u0686 \u0646\u0627\u0645\u062a\u0642\u0627\u0631\u0646 \u0627\u0633\u062a: \u067e\u0686 \u0627\u0632 <code>file.txt<\/code> \u0628\u0647 <code>new_file.txt<\/code> \u0647\u0645\u0627\u0646 \u067e\u0686 \u0628\u0631\u0627\u06cc \u062c\u0647\u062a \u062f\u06cc\u06af\u0631 \u0646\u06cc\u0633\u062a.<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u062f\u0631 \u0627\u06cc\u0646 \u0645\u062b\u0627\u0644\u060c \u062a\u0648\u0644\u06cc\u062f a <code>patch<\/code> \u0628\u06cc\u0646 <code>new_file.txt<\/code> \u0648 <code>file.txt<\/code>\u060c \u062f\u0631 \u0627\u06cc\u0646 \u062a\u0631\u062a\u06cc\u0628\u060c \u062f\u0642\u06cc\u0642\u0627\u064b \u0628\u0647 \u0645\u0639\u0646\u0627\u06cc \u062f\u0633\u062a\u0648\u0631\u0627\u0644\u0639\u0645\u0644 \u0647\u0627\u06cc \u0645\u062e\u0627\u0644\u0641 \u0642\u0628\u0644\u06cc \u0627\u0633\u062a &#8211; \u0628\u0647 \u062c\u0627\u06cc \u062d\u0630\u0641 \u062e\u0637 \u062f\u0648\u0645 \u0648 \u063a\u06cc\u0631\u0647 \u0631\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/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-167.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-167\" width=\"538\" height=\"108\" loading=\"lazy\" title=\"\"><figcaption>\u0622 <code>patch<\/code> \u0634\u0627\u0645\u0644 \u062f\u0633\u062a\u0648\u0631\u0627\u0644\u0639\u0645\u0644 \u0647\u0627\u06cc \u0646\u0627\u0645\u062a\u0642\u0627\u0631\u0646 \u0628\u0631\u0627\u06cc \u0631\u0633\u06cc\u062f\u0646 \u0627\u0632 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0628\u0647 \u0641\u0627\u06cc\u0644 \u062f\u06cc\u06af\u0631 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0622\u0646 \u0631\u0627 \u0627\u0645\u062a\u062d\u0627\u0646 \u06a9\u0646\u06cc\u062f:<br \/>\n<code>git diff -\u2013no-index new_file.txt file.txt<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-169.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-169\" width=\"371\" height=\"303\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u062f\u0648\u06cc\u062f\u0646 <code>git diff<\/code> \u062f\u0631 \u062c\u0647\u062a \u0645\u0639\u06a9\u0648\u0633 \u062f\u0633\u062a\u0648\u0631\u0627\u0644\u0639\u0645\u0644 \u0647\u0627\u06cc \u0645\u0639\u06a9\u0648\u0633 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f &#8211; \u0628\u0647 \u062c\u0627\u06cc \u062d\u0630\u0641 \u06cc\u06a9 \u062e\u0637 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f \u0648 \u063a\u06cc\u0631\u0647 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0627\u06cc\u0646 <code>patch<\/code> \u0641\u0631\u0645\u062a \u0627\u0632 \u0632\u0645\u06cc\u0646\u0647 \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637\u0648\u0637 \u0628\u0631\u0627\u06cc \u06cc\u0627\u0641\u062a\u0646 \u0645\u0646\u0627\u0637\u0642 \u0645\u062e\u062a\u0644\u0641 \u0641\u0627\u06cc\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u06a9\u0646\u062f.  \u0627\u06cc\u0646 \u0627\u062c\u0627\u0632\u0647 \u0645\u06cc \u062f\u0647\u062f \u062a\u0627 a <code>patch<\/code> \u062a\u0627 \u0632\u0645\u0627\u0646\u06cc \u06a9\u0647 \u0628\u0631\u0646\u0627\u0645\u0647 \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u0646\u062f\u0647 \u0647\u0645\u0686\u0646\u0627\u0646 \u0628\u062a\u0648\u0627\u0646\u062f \u0632\u0645\u06cc\u0646\u0647 \u062a\u063a\u06cc\u06cc\u0631 \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u062f\u060c \u0631\u0648\u06cc \u0646\u0633\u062e\u0647 \u06a9\u0645\u06cc \u0632\u0648\u062f\u062a\u0631 \u06cc\u0627 \u062c\u062f\u06cc\u062f\u062a\u0631 \u0627\u0632 \u0627\u0648\u0644\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0646\u0633\u0628\u062a \u0628\u0647 \u0646\u0633\u062e\u0647 \u0627\u06cc \u06a9\u0647 \u0627\u0632 \u0622\u0646 \u0645\u0634\u062a\u0642 \u0634\u062f\u0647 \u0627\u0633\u062a \u0627\u0639\u0645\u0627\u0644 \u0634\u0648\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<h2 id=\"the-structure-of-a-diff-\"><span class=\"ez-toc-section\" id=\"%d8%b3%d8%a7%d8%ae%d8%aa%d8%a7%d8%b1_%db%8c%da%a9_%d8%aa%d9%81%d8%a7%d9%88%d8%aa_%f0%9f%94%8d\"><\/span>\u0633\u0627\u062e\u062a\u0627\u0631 \u06cc\u06a9 \u062a\u0641\u0627\u0648\u062a \ud83d\udd0d<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646\u060c \u0648\u0642\u062a \u0622\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0639\u0645\u06cc\u0642 \u062a\u0631 \u0634\u06cc\u0631\u062c\u0647 \u0628\u0632\u0646\u06cc\u062f.<\/p>\n<p>\u0627\u06cc\u062c\u0627\u062f \u062a\u0641\u0627\u0648\u062a \u0627\u0632 <code>file.txt<\/code> \u0628\u0647 <code>new_file.txt<\/code> \u062f\u0648\u0628\u0627\u0631\u0647\u060c \u0648 \u062e\u0631\u0648\u062c\u06cc \u0631\u0627 \u0628\u0627 \u062f\u0642\u062a \u0628\u06cc\u0634\u062a\u0631\u06cc \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<p><code>git diff -\u2013no-index file.txt new_file.txt<\/code><\/p>\n<p>\u062e\u0637 \u0627\u0648\u0644 \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u0645\u0642\u0627\u06cc\u0633\u0647 \u0634\u062f\u0647 \u0631\u0627 \u0645\u0639\u0631\u0641\u06cc \u0645\u06cc \u06a9\u0646\u062f.  Git \u0647\u0645\u06cc\u0634\u0647 \u0646\u0627\u0645 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0645\u06cc \u062f\u0647\u062f <code>a<\/code>\u060c \u0648 \u062f\u06cc\u06af\u0631\u06cc \u0646\u0627\u0645 <code>b<\/code>.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f <code>file.txt<\/code> \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc\u0634\u0648\u062f <code>a<\/code>\u060c \u062f\u0631 \u062d\u0627\u0644\u06cc\u06a9\u0647 <code>new_file.txt<\/code> \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc\u0634\u0648\u062f <code>b<\/code>.<\/p>\n<p><!--kg-card-end: markdown--><\/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-170.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-170\" width=\"325\" height=\"45\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0637 \u0627\u0648\u0644 \u062f\u0631 <code>diff<\/code> \u062e\u0631\u0648\u062c\u06cc &#8216;s \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u062f\u0631 \u062d\u0627\u0644 \u0645\u0642\u0627\u06cc\u0633\u0647 \u0631\u0627 \u0645\u0639\u0631\u0641\u06cc \u0645\u06cc \u06a9\u0646\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0633\u067e\u0633 \u062e\u0637 \u062f\u0648\u0645\u060c \u0628\u0627 \u0634\u0631\u0648\u0639 <code>index<\/code>\u060c \u0634\u0627\u0645\u0644 blob SHA \u0647\u0627\u06cc \u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0647\u0627 \u0645\u06cc \u0628\u0627\u0634\u062f.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062d\u062a\u06cc \u0627\u06af\u0631 \u062f\u0631 \u0645\u0648\u0631\u062f \u0645\u0627 \u0622\u0646\u0647\u0627 \u062d\u062a\u06cc \u062f\u0631 \u06cc\u06a9 \u0645\u062e\u0632\u0646 Git \u0630\u062e\u06cc\u0631\u0647 \u0646\u0645\u06cc \u0634\u0648\u0646\u062f\u060c Git \u0645\u0642\u0627\u062f\u06cc\u0631 SHA-1 \u0645\u0631\u0628\u0648\u0637\u0647 \u0622\u0646\u0647\u0627 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f.<\/p>\n<p>\u0627\u06af\u0631 \u062f\u0631 \u0645\u0648\u0631\u062f blobs \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635 \u0648 \u0627\u0634\u06cc\u0627\u0621 Git \u0628\u0647 \u0637\u0648\u0631 \u06a9\u0644\u06cc \u0646\u06cc\u0627\u0632 \u0628\u0647 \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc \u062f\u0627\u0631\u06cc\u062f\u060c \u0627\u06cc\u0646 \u067e\u0633\u062a \u0631\u0627 \u0628\u0631\u0631\u0633\u06cc \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0645\u0642\u062f\u0627\u0631 \u0633\u0648\u0645 \u062f\u0631 \u0627\u06cc\u0646 \u062e\u0637\u060c <code>100644<\/code>\u060c &#8220;\u0628\u06cc\u062a \u0647\u0627\u06cc \u062d\u0627\u0644\u062a&#8221; \u0627\u0633\u062a\u060c \u06a9\u0647 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f \u0627\u06cc\u0646 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 &#8220;\u0639\u0627\u062f\u06cc&#8221; \u0627\u0633\u062a: \u0627\u062c\u0631\u0627\u06cc\u06cc \u0646\u06cc\u0633\u062a \u0648 \u06cc\u06a9 \u067e\u06cc\u0648\u0646\u062f \u0646\u0645\u0627\u062f\u06cc\u0646 \u0646\u06cc\u0633\u062a.<\/p>\n<p>\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u062f\u0648 \u0646\u0642\u0637\u0647 (<code>..<\/code>) \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0628\u06cc\u0646 blob SHA\u0647\u0627 \u0641\u0642\u0637 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u062c\u062f\u0627\u06a9\u0646\u0646\u062f\u0647 \u0627\u0633\u062a (\u0628\u0631 \u062e\u0644\u0627\u0641 \u0645\u0648\u0627\u0631\u062f \u062f\u06cc\u06af\u0631 \u06a9\u0647 \u062f\u0631 Git \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u0634\u0648\u062f).<\/p>\n<p>\u0633\u0627\u06cc\u0631 \u062e\u0637\u0648\u0637 \u0633\u0631\u0635\u0641\u062d\u0647 \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0628\u06cc\u062a \u0647\u0627\u06cc \u062d\u0627\u0644\u062a \u0642\u062f\u06cc\u0645\u06cc \u0648 \u062c\u062f\u06cc\u062f \u0631\u0627 \u062f\u0631 \u0635\u0648\u0631\u062a \u062a\u063a\u06cc\u06cc\u0631\u060c \u0646\u0627\u0645 \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u0642\u062f\u06cc\u0645\u06cc \u0648 \u062c\u062f\u06cc\u062f \u0631\u0627 \u062f\u0631 \u0635\u0648\u0631\u062a \u062a\u063a\u06cc\u06cc\u0631 \u0646\u0627\u0645 \u0648 \u063a\u06cc\u0631\u0647 \u0646\u0634\u0627\u0646 \u062f\u0647\u0646\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/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-171.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-171\" width=\"548\" height=\"84\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0637 \u062f\u0648\u0645 \u062f\u0631 <code>diff<\/code> \u062e\u0631\u0648\u062c\u06cc \u0634\u0627\u0645\u0644 blob SHA\u0647\u0627\u06cc \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u0645\u0642\u0627\u06cc\u0633\u0647 \u0634\u062f\u0647 \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u0628\u06cc\u062a \u0647\u0627\u06cc \u062d\u0627\u0644\u062a \u0627\u0633\u062a (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0627\u06af\u0631 \u0627\u06cc\u0646 \u0648\u0635\u0644\u0647 \u0628\u0639\u062f\u0627\u064b \u062a\u0648\u0633\u0637 Git \u0628\u0647 \u0647\u0645\u0627\u0646 \u067e\u0631\u0648\u0698\u0647 \u0627\u0639\u0645\u0627\u0644 \u0634\u0648\u062f \u0648 \u062f\u0631 \u062d\u06cc\u0646 \u0627\u0639\u0645\u0627\u0644 \u0622\u0646 \u062a\u062f\u0627\u062e\u0644 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f\u060c SHA\u0647\u0627\u06cc blob (\u06a9\u0647 &#8220;\u0634\u0646\u0627\u0633\u0647 \u0647\u0627\u06cc blob&#8221; \u0646\u06cc\u0632 \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc \u0634\u0648\u062f) \u0645\u0641\u06cc\u062f \u0647\u0633\u062a\u0646\u062f.<\/p>\n<p>\u0628\u0639\u062f \u0627\u0632 \u0634\u0646\u0627\u0633\u0647 \u0647\u0627\u06cc blob\u060c \u062f\u0648 \u062e\u0637 \u062f\u0627\u0631\u06cc\u0645: \u06cc\u06a9\u06cc \u0628\u0627 \u0634\u0631\u0648\u0639 <code>-<\/code> \u0646\u0634\u0627\u0646\u0647 \u0647\u0627\u060c \u0648 \u062f\u06cc\u06af\u0631\u06cc \u0628\u0627 \u0634\u0631\u0648\u0639 <code>+<\/code> \u0646\u0634\u0627\u0646\u0647 \u0647\u0627  \u0627\u06cc\u0646 \u0647\u062f\u0631 \u0633\u0646\u062a\u06cc &#8220;\u062a\u0641\u0627\u0648\u062a \u06cc\u06a9\u067e\u0627\u0631\u0686\u0647&#8221; \u0627\u0633\u062a \u06a9\u0647 \u062f\u0648\u0628\u0627\u0631\u0647 \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u062f\u0631 \u062d\u0627\u0644 \u0645\u0642\u0627\u06cc\u0633\u0647 \u0648 \u062c\u0647\u062a \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f: <code>-<\/code> \u0646\u0634\u0627\u0646\u0647 \u0647\u0627 \u062e\u0637\u0648\u0637\u06cc \u0631\u0627 \u062f\u0631 \u0646\u0633\u062e\u0647 A \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u0646\u062f \u0627\u0645\u0627 \u062f\u0631 \u0646\u0633\u062e\u0647 B \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u0646\u062f \u0648 <code>+<\/code> \u0639\u0644\u0627\u0626\u0645\u060c \u062e\u0637\u0648\u0637\u06cc \u06a9\u0647 \u062f\u0631 \u0646\u0633\u062e\u0647 A \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f \u0627\u0645\u0627 \u062f\u0631 B \u0645\u0648\u062c\u0648\u062f \u0627\u0633\u062a.<\/p>\n<p>\u0627\u06af\u0631 \u0648\u0635\u0644\u0647 \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0628\u0627\u0634\u062f \u06a9\u0647 \u0628\u0647 \u0637\u0648\u0631 \u06a9\u0627\u0645\u0644 \u0627\u0636\u0627\u0641\u0647 \u06cc\u0627 \u062d\u0630\u0641 \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u06cc\u06a9\u06cc \u0627\u0632 \u0627\u06cc\u0646 \u0645\u0648\u0627\u0631\u062f \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f <code>\/dev\/null<\/code> \u0628\u0631\u0627\u06cc \u0646\u0634\u0627\u0646 \u062f\u0627\u062f\u0646 \u0622\u0646<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-172.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-172\" width=\"224\" height=\"96\" loading=\"lazy\" title=\"\"><figcaption><code>-<\/code>  \u0646\u0634\u0627\u0646\u0647 \u0647\u0627 \u062e\u0637\u0648\u0637\u06cc \u0631\u0627 \u062f\u0631 \u0646\u0633\u062e\u0647 A \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u0646\u062f \u0627\u0645\u0627 \u062f\u0631 \u0646\u0633\u062e\u0647 B \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u0646\u062f.  \u0648 <code>+<\/code> \u0639\u0644\u0627\u0626\u0645\u060c \u062e\u0637\u0648\u0637\u06cc \u06a9\u0647 \u062f\u0631 \u0646\u0633\u062e\u0647 A \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f \u0627\u0645\u0627 \u062f\u0631 B \u0645\u0648\u062c\u0648\u062f \u0627\u0633\u062a (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0645\u0648\u0631\u062f\u06cc \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f \u06a9\u0647 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u062d\u0630\u0641 \u0645\u06cc \u06a9\u0646\u06cc\u0645:<br \/>\n<code>rm file.txt<\/code><\/p>\n<p>\u0648 \u0633\u067e\u0633 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u0645 <code>git diff<\/code>:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-173.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-173\" width=\"464\" height=\"389\" loading=\"lazy\" title=\"\"><figcaption><code>diff<\/code>\u062e\u0631\u0648\u062c\u06cc \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062d\u0630\u0641 \u0634\u062f\u0647 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0646\u0633\u062e\u0647 A\u060c \u0646\u0634\u0627\u0646 \u062f\u0647\u0646\u062f\u0647 \u0648\u0636\u0639\u06cc\u062a \u0634\u0627\u062e\u0635\u060c \u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631 \u0627\u0633\u062a <code>file.txt<\/code>\u060c \u062f\u0631 \u0645\u0642\u0627\u06cc\u0633\u0647 \u0628\u0627 dir \u06a9\u0627\u0631\u06cc \u06a9\u0647 \u062f\u0631 \u0622\u0646 \u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f\u060c \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f <code>\/dev\/null<\/code>.  \u0647\u0645\u0647 \u062e\u0637\u0648\u0637 \u0642\u0628\u0644 \u0627\u0632 <code>-<\/code> \u0646\u0634\u0627\u0646\u0647 \u0647\u0627\u06cc\u06cc \u06a9\u0647 \u0641\u0642\u0637 \u062f\u0631 \u0646\u0633\u062e\u0647 A \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u0646\u062f.<\/p>\n<p>\u0628\u0627\u0632\u06af\u0634\u062a \u0628\u0647 \u062a\u0641\u0627\u0648\u062a \u0642\u0628\u0644\u06cc:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-174.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-174\" width=\"535\" height=\"422\" loading=\"lazy\" title=\"\"><figcaption><code>diff<\/code>\u062e\u0631\u0648\u062c\u06cc &#8216;s \u0634\u0627\u0645\u0644 \u0628\u062e\u0634 \u0647\u0627\u06cc \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0628\u0647 \u0646\u0627\u0645 &#8220;hunks&#8221; \u06cc\u0627 &#8220;chunks&#8221; \u0627\u0633\u062a (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u067e\u0633 \u0627\u0632 \u0627\u06cc\u0646 \u0647\u062f\u0631 \u062a\u0641\u0627\u0648\u062a \u06cc\u06a9\u067e\u0627\u0631\u0686\u0647\u060c \u0628\u0647 \u0628\u062e\u0634 \u0627\u0635\u0644\u06cc \u062a\u0641\u0627\u0648\u062a \u0645\u06cc\u200c\u0631\u0633\u06cc\u0645 \u06a9\u0647 \u0634\u0627\u0645\u0644 \u00ab\u0628\u062e\u0634\u200c\u0647\u0627\u06cc \u062a\u0641\u0627\u0648\u062a\u00bb \u0627\u0633\u062a \u06a9\u0647 \u062f\u0631 Git \u00abhunks\u00bb \u06cc\u0627 \u00abchunks\u00bb \u0646\u06cc\u0632 \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc\u200c\u0634\u0648\u062f.<\/p>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u0627\u06cc\u0646 \u0627\u0635\u0637\u0644\u0627\u062d\u0627\u062a \u0628\u0647 \u062c\u0627\u06cc \u06cc\u06a9\u062f\u06cc\u06af\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u0634\u0648\u0646\u062f \u0648 \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u062f\u0631 \u0645\u0633\u062a\u0646\u062f\u0627\u062a \u0648 \u0622\u0645\u0648\u0632\u0634 \u0647\u0627\u06cc Git \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u06a9\u062f \u0645\u0646\u0628\u0639 Git \u0628\u0647 \u0647\u0631 \u06cc\u06a9 \u0627\u0632 \u0622\u0646\u0647\u0627 \u0628\u0631\u062e\u0648\u0631\u062f \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0647\u0631 \u0642\u0637\u0639\u0647 \u0628\u0627 \u06cc\u06a9 \u062e\u0637 \u0634\u0631\u0648\u0639 \u0645\u06cc \u0634\u0648\u062f \u06a9\u0647 \u0628\u0627 \u062f\u0648 \u062e\u0637 \u0634\u0631\u0648\u0639 \u0645\u06cc \u0634\u0648\u062f <code>@<\/code> \u0646\u0634\u0627\u0646\u0647 \u0647\u0627  \u0627\u06cc\u0646 \u0646\u0634\u0627\u0646\u0647 \u0647\u0627 \u062d\u062f\u0627\u06a9\u062b\u0631 \u0628\u0627 \u0686\u0647\u0627\u0631 \u0639\u062f\u062f \u062f\u0646\u0628\u0627\u0644 \u0645\u06cc \u0634\u0648\u0646\u062f \u0648 \u0633\u067e\u0633 \u06cc\u06a9 \u0647\u062f\u0631 \u0628\u0631\u0627\u06cc \u0642\u0637\u0639\u0647 &#8211; \u06a9\u0647 \u06cc\u06a9 \u062d\u062f\u0633 \u0622\u0645\u0648\u0632\u0634\u06cc \u062a\u0648\u0633\u0637 Git \u0627\u0633\u062a \u06a9\u0647 \u06af\u0627\u0647\u06cc \u0627\u0648\u0642\u0627\u062a \u0628\u0647 \u062e\u0648\u0628\u06cc \u06a9\u0627\u0631 \u0645\u06cc \u06a9\u0646\u062f.<\/p>\n<p>\u0645\u0639\u0645\u0648\u0644\u0627\u064b \u062f\u0631 \u0635\u0648\u0631\u062a \u0627\u0645\u06a9\u0627\u0646\u060c \u0634\u0631\u0648\u0639 \u06cc\u06a9 \u062a\u0627\u0628\u0639 \u06cc\u0627 \u06cc\u06a9 \u06a9\u0644\u0627\u0633 \u0631\u0627 \u0634\u0627\u0645\u0644 \u0645\u06cc \u0634\u0648\u062f.  \u062f\u0631 \u0627\u06cc\u0646 \u0645\u062b\u0627\u0644 \u0647\u06cc\u0686 \u0686\u06cc\u0632\u06cc \u0631\u0627 \u0634\u0627\u0645\u0644 \u0646\u0645\u06cc \u0634\u0648\u062f \u0632\u06cc\u0631\u0627 \u0627\u06cc\u0646 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0645\u062a\u0646\u06cc \u0627\u0633\u062a\u060c \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0645\u062b\u0627\u0644 \u062f\u06cc\u06af\u0631\u06cc \u0631\u0627 \u0628\u0631\u0627\u06cc \u0644\u062d\u0638\u0647 \u0627\u06cc \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<p><code>git diff -\u2013no-index example.py example_changed.py<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-175.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-175\" width=\"644\" height=\"359\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u0635\u0648\u0631\u062a \u0627\u0645\u06a9\u0627\u0646\u060c Git \u0634\u0627\u0645\u0644 \u06cc\u06a9 \u0647\u062f\u0631 \u0628\u0631\u0627\u06cc \u0647\u0631 \u0647\u0627\u0646\u06a9 \u0627\u0633\u062a\u060c \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u062b\u0627\u0644 \u06cc\u06a9 \u062a\u0627\u0628\u0639 \u06cc\u0627 \u062a\u0639\u0631\u06cc\u0641 \u06a9\u0644\u0627\u0633 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062f\u0631 \u062a\u0635\u0648\u06cc\u0631 \u0628\u0627\u0644\u0627 \u0647\u062f\u0631 hunk \u0634\u0627\u0645\u0644 \u0627\u0628\u062a\u062f\u0627\u06cc \u062a\u0627\u0628\u0639\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0634\u0627\u0645\u0644 \u062e\u0637\u0648\u0637 \u062a\u063a\u06cc\u06cc\u0631 \u06cc\u0627\u0641\u062a\u0647 \u0627\u0633\u062a &#8211; <code>def example_function(x)<\/code>.<\/p>\n<p>\u0633\u067e\u0633 \u0628\u0647 \u0645\u062b\u0627\u0644 \u0642\u0628\u0644\u06cc \u062e\u0648\u062f \u0628\u0627\u0632\u06af\u0631\u062f\u06cc\u062f:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-174.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-174\" width=\"535\" height=\"422\" loading=\"lazy\" title=\"\"><figcaption>\u0628\u0627\u0632\u06af\u0634\u062a \u0628\u0647 \u0642\u0628\u0644\u06cc <code>diff<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0639\u062f \u0627\u0632 \u0622\u0646 \u062f\u0648 <code>@<\/code> \u0646\u0634\u0627\u0646\u0647 \u0647\u0627\u060c \u0634\u0645\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0686\u0647\u0627\u0631 \u0639\u062f\u062f \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0627\u0639\u062f\u0627\u062f \u0627\u0648\u0644 \u0628\u0627 a \u062c\u0644\u0648 \u0645\u06cc \u0622\u06cc\u0646\u062f <code>-<\/code> \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u0646\u062f \u0639\u0644\u0627\u0645\u062a \u0628\u0632\u0646\u06cc\u062f <code>file A<\/code>.  \u0639\u062f\u062f \u0627\u0648\u0644 \u0646\u0634\u0627\u0646 \u062f\u0647\u0646\u062f\u0647 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637 \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0633\u0637\u0631 \u0627\u0648\u0644 \u062f\u0631 \u0627\u0633\u062a <code>file A<\/code> \u0627\u06cc\u0646 \u0642\u0637\u0639\u0647 \u0628\u0647  \u062f\u0631 \u0645\u062b\u0627\u0644 \u0628\u0627\u0644\u0627 \u0627\u06cc\u0646\u0637\u0648\u0631 \u0627\u0633\u062a <code>1<\/code>\u060c \u0628\u0647 \u0627\u06cc\u0646 \u0645\u0639\u0646\u06cc \u06a9\u0647 \u062e\u0637 <code>This is a simple file<\/code> \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637 \u0627\u0633\u062a <code>1<\/code> \u062f\u0631 \u0646\u0633\u062e\u0647 <code>file A<\/code>.<\/p>\n<p>\u0627\u06cc\u0646 \u0639\u062f\u062f \u0628\u0627 \u06a9\u0627\u0645\u0627 (<code>,<\/code>) \u0648 \u0633\u067e\u0633 \u062a\u0639\u062f\u0627\u062f \u062e\u0637\u0648\u0637\u06cc \u06a9\u0647 \u0627\u06cc\u0646 \u062a\u06a9\u0647 \u0627\u0632 \u0622\u0646 \u062a\u0634\u06a9\u06cc\u0644 \u0634\u062f\u0647 \u0627\u0633\u062a <code>file A<\/code>.  \u0627\u06cc\u0646 \u0639\u062f\u062f \u0634\u0627\u0645\u0644 \u062a\u0645\u0627\u0645 \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 (\u062e\u0637\u0648\u0637 \u0642\u0628\u0644 \u0628\u0627 \u06cc\u06a9 \u0641\u0627\u0635\u0644\u0647 \u062f\u0631 \u062a\u0641\u0627\u0648\u062a)\u060c \u06cc\u0627 \u062e\u0637\u0648\u0637 \u0645\u0634\u062e\u0635 \u0634\u062f\u0647 \u0628\u0627 \u06cc\u06a9 <code>-<\/code> \u0639\u0644\u0627\u0645\u062a\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0622\u0646\u0647\u0627 \u0628\u062e\u0634\u06cc \u0627\u0632 <code>file A<\/code>\u060c \u0627\u0645\u0627 \u0646\u0647 \u062e\u0637\u0648\u0637 \u0645\u0634\u062e\u0635 \u0634\u062f\u0647 \u0628\u0627 a <code>+<\/code> \u0631\u0627 \u0627\u0645\u0636\u0627 \u06a9\u0646\u06cc\u062f\u060c \u0632\u06cc\u0631\u0627 \u0622\u0646\u0647\u0627 \u062f\u0631 \u0622\u0646 \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u0646\u062f <code>file A<\/code>.<\/p>\n<p>\u062f\u0631 \u0645\u062b\u0627\u0644 \u0628\u0627\u0644\u0627 \u0627\u06cc\u0646 \u0639\u062f\u062f \u0627\u0633\u062a <code>6<\/code>\u060c \u0634\u0645\u0627\u0631\u0634 \u062e\u0637 \u0632\u0645\u06cc\u0646\u0647 <code>This is a simple file<\/code>\u060c <code>-<\/code> \u062e\u0637 <code>It has a nice poem:<\/code>\u060c \u0633\u067e\u0633 \u0633\u0647 \u062e\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0648 \u062f\u0631 \u0622\u062e\u0631 <code>Are belong to you<\/code>.<\/p>\n<p>\u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0645\u06cc \u0628\u06cc\u0646\u06cc\u062f\u060c \u062e\u0637\u0648\u0637\u06cc \u06a9\u0647 \u0628\u0627 \u06cc\u06a9 \u06a9\u0627\u0631\u0627\u06a9\u062a\u0631 \u0641\u0627\u0635\u0644\u0647 \u0634\u0631\u0648\u0639 \u0645\u06cc \u0634\u0648\u0646\u062f\u060c \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0647\u0633\u062a\u0646\u062f\u060c \u0628\u0647 \u0627\u06cc\u0646 \u0645\u0639\u0646\u06cc \u06a9\u0647 \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u062f\u0631 \u0647\u0631 \u062f\u0648 \u0646\u0634\u0627\u0646 \u062f\u0627\u062f\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a \u0638\u0627\u0647\u0631 \u0645\u06cc \u0634\u0648\u0646\u062f <code>file A<\/code> \u0648 <code>file B<\/code>.<\/p>\n<p>\u0633\u067e\u0633\u060c \u0645\u0627 \u06cc\u06a9 <code>+<\/code> \u0628\u0631\u0627\u06cc \u0639\u0644\u0627\u0645\u062a \u06af\u0630\u0627\u0631\u06cc \u062f\u0648 \u0639\u062f\u062f\u06cc \u06a9\u0647 \u0628\u0647 \u0622\u0646\u0647\u0627 \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u0634\u0648\u062f \u0639\u0644\u0627\u0645\u062a \u0628\u0632\u0646\u06cc\u062f <code>file B<\/code>.  \u0627\u0628\u062a\u062f\u0627 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637 \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0633\u0637\u0631 \u0627\u0648\u0644 \u062f\u0631 <code>file B<\/code>\u0648 \u0628\u0647 \u062f\u0646\u0628\u0627\u0644 \u0622\u0646 \u062a\u0639\u062f\u0627\u062f \u062e\u0637\u0648\u0637\u06cc \u06a9\u0647 \u0627\u06cc\u0646 \u0642\u0637\u0639\u0647 \u0634\u0627\u0645\u0644 &#8211; in \u0627\u0633\u062a <code>file B<\/code>.<\/p>\n<p>\u0627\u06cc\u0646 \u0634\u0645\u0627\u0631\u0647 \u0634\u0627\u0645\u0644 \u062a\u0645\u0627\u0645 \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u062e\u0637\u0648\u0637\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0628\u0627 \u0639\u0644\u0627\u0645\u062a \u0639\u0644\u0627\u0645\u062a \u06af\u0630\u0627\u0631\u06cc \u0634\u062f\u0647 \u0627\u0646\u062f <code>+<\/code> \u0639\u0644\u0627\u0645\u062a\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0622\u0646\u0647\u0627 \u0628\u062e\u0634\u06cc \u0627\u0632 <code>file B<\/code>\u060c \u0627\u0645\u0627 \u0646\u0647 \u062e\u0637\u0648\u0637 \u0645\u0634\u062e\u0635 \u0634\u062f\u0647 \u0628\u0627 a <code>-<\/code> \u0627\u0645\u0636\u0627 \u06a9\u0631\u062f\u0646.<\/p>\n<p>\u0628\u0639\u062f \u0627\u0632 \u0647\u062f\u0631 \u0642\u0637\u0639\u0647\u060c \u062e\u0637\u0648\u0637 \u0648\u0627\u0642\u0639\u06cc \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u0645\u06cc \u06a9\u0646\u06cc\u0645 &#8211; \u06cc\u0627 \u0632\u0645\u06cc\u0646\u0647\u060c <code>-<\/code> \u06cc\u0627 <code>+<\/code> \u062e\u0637\u0648\u0637<\/p>\n<p>\u0628\u0647 \u0637\u0648\u0631 \u0645\u0639\u0645\u0648\u0644 \u0648 \u0628\u0647 \u0637\u0648\u0631 \u067e\u06cc\u0634 \u0641\u0631\u0636\u060c \u06cc\u06a9 \u0647\u0627\u0646\u06a9 \u0628\u0627 \u0633\u0647 \u062e\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0634\u0631\u0648\u0639 \u0648 \u0628\u0647 \u067e\u0627\u06cc\u0627\u0646 \u0645\u06cc \u0631\u0633\u062f\u060c \u062f\u0631 \u0635\u0648\u0631\u062a\u06cc \u06a9\u0647 \u0627\u0644\u0628\u062a\u0647 \u0633\u0647 \u062e\u0637 \u0642\u0628\u0644 \u0648 \u0628\u0639\u062f \u0627\u0632 \u062e\u0637\u0648\u0637 \u0627\u0635\u0644\u0627\u062d \u0634\u062f\u0647 \u062f\u0631 \u0641\u0627\u06cc\u0644 \u0645\u0646\u0628\u0639 \u0648\u062c\u0648\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-176.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-176\" width=\"1245\" height=\"550\" loading=\"lazy\" title=\"\"><figcaption>\u0641\u0631\u0645\u062a \u067e\u0686 \u062a\u0648\u0633\u0637 <code>git diff<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<h2 id=\"how-to-produce-diffs-\"><span class=\"ez-toc-section\" id=\"%d9%86%d8%ad%d9%88%d9%87_%d8%aa%d9%88%d9%84%db%8c%d8%af_%d8%aa%d9%81%d8%a7%d9%88%d8%aa_%d9%87%d8%a7_%e2%8c%a8%ef%b8%8f\"><\/span>\u0646\u062d\u0648\u0647 \u062a\u0648\u0644\u06cc\u062f \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u2328\ufe0f<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0645\u062b\u0627\u0644 \u0628\u0627\u0644\u0627 \u062f\u0642\u06cc\u0642\u0627\u064b \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u062f\u0648 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f.  \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u067e\u0686 \u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u062f \u0634\u0627\u0645\u0644 \u062a\u0641\u0627\u0648\u062a\u200c\u0647\u0627\u06cc\u06cc \u0628\u0631\u0627\u06cc \u0647\u0631 \u062a\u0639\u062f\u0627\u062f \u0641\u0627\u06cc\u0644 \u0628\u0627\u0634\u062f \u0648 <code>git diff<\/code> \u0628\u0631\u0627\u06cc \u0647\u0645\u0647 \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u062a\u063a\u06cc\u06cc\u0631 \u06cc\u0627\u0641\u062a\u0647 \u062f\u0631 \u0645\u062e\u0632\u0646 \u062f\u0631 \u06cc\u06a9 \u067e\u0686 \u062a\u0641\u0627\u0648\u062a \u0627\u06cc\u062c\u0627\u062f \u0645\u06cc \u06a9\u0646\u062f.<\/p>\n<p>\u0627\u063a\u0644\u0628\u060c \u0634\u0645\u0627 \u062e\u0631\u0648\u062c\u06cc \u0631\u0627 \u0645\u0634\u0627\u0647\u062f\u0647 \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f <code>git diff<\/code> \u0646\u0645\u0627\u06cc\u0634 \u062f\u0648 \u0646\u0633\u062e\u0647 \u0627\u0632 <em>\u06cc\u06a9\u0633\u0627\u0646<\/em> \u0641\u0627\u06cc\u0644 \u0648 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0622\u0646\u0647\u0627<\/p>\n<p>\u0628\u0631\u0627\u06cc \u0646\u0634\u0627\u0646 \u062f\u0627\u062f\u0646\u060c \u0627\u06cc\u0646 \u0645\u062e\u0632\u0646 \u062f\u06cc\u06af\u0631 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<p><code>cd ~\/brief-example<\/code><\/p>\n<p>\u062f\u0631 \u0648\u0636\u0639\u06cc\u062a \u0641\u0639\u0644\u06cc\u060c \u062f\u0627\u06cc\u0631\u06a9\u062a\u0648\u0631\u06cc \u0641\u0639\u0627\u0644 \u06cc\u06a9 \u0645\u062e\u0632\u0646 Git \u0628\u0627 \u0648\u0636\u0639\u06cc\u062a \u062a\u0645\u06cc\u0632 \u0627\u0633\u062a:<\/p>\n<p><code>git status<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-177.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-177\" width=\"588\" height=\"156\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u0645\u062e\u0632\u0646 \u062f\u06cc\u06af\u0631\u06cc \u0628\u0627 \u0648\u0636\u0639\u06cc\u062a \u062a\u0645\u06cc\u0632 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0645\u0648\u062c\u0648\u062f \u0631\u0627 \u0628\u06af\u06cc\u0631\u06cc\u062f\u060c \u0645\u0627\u0646\u0646\u062f \u0627\u06cc\u0646:<\/p>\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-178.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-178\" width=\"660\" height=\"330\" loading=\"lazy\" title=\"\"><figcaption>\u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0646\u0645\u0648\u0646\u0647 &#8211; <code>my_file.py<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0648 \u06cc\u06a9\u06cc \u0627\u0632 \u062e\u0637\u0648\u0637 \u0622\u0646 \u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u06cc\u062f.  \u0628\u0631\u0627\u06cc \u0645\u062b\u0627\u0644 \u062e\u0637 \u062f\u0648\u0645 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\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-179.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-179\" width=\"807\" height=\"312\" loading=\"lazy\" title=\"\"><figcaption>\u0645\u0637\u0627\u0644\u0628 \u0627\u0632 <code>my_file.py<\/code> \u067e\u0633 \u0627\u0632 \u0627\u0635\u0644\u0627\u062d \u062e\u0637 \u062f\u0648\u0645 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0648 \u0627\u062c\u0631\u0627 <code>git diff<\/code>:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-180.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-180\" width=\"805\" height=\"354\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff<\/code> \u0628\u0631\u0627\u06cc <code>my_file.py<\/code> \u067e\u0633 \u0627\u0632 \u062a\u063a\u06cc\u06cc\u0631 \u0622\u0646 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff<\/code> \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f <code>my_file.py<\/code>\u0646\u0633\u062e\u0647 \u062f\u0631 \u0642\u0633\u0645\u062a \u0627\u0633\u062a\u06cc\u062c\u06cc\u0646\u06af \u06a9\u0647 \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f \u0647\u0645\u0627\u0646 \u0622\u062e\u0631\u06cc\u0646 \u06a9\u0627\u0645\u06cc\u062a \u0627\u0633\u062a (<code>HEAD<\/code>) \u0648 \u062f\u0631 \u062f\u0627\u06cc\u0631\u06a9\u062a\u0648\u0631\u06cc \u06a9\u0627\u0631\u06cc.<\/p>\n<p>\u0645\u0646 \u0639\u0628\u0627\u0631\u0627\u062a &#8220;\u062f\u0627\u06cc\u0631\u06a9\u062a\u0648\u0631\u06cc \u06a9\u0627\u0631\u06cc&#8221;\u060c &#8220;\u0645\u0646\u0637\u0642\u0647 \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc&#8221; \u0648 &#8220;\u062a\u0639\u0647\u062f&#8221; \u0631\u0627 \u062f\u0631 \u067e\u0633\u062a \u0642\u0628\u0644\u06cc \u062a\u0648\u0636\u06cc\u062d \u062f\u0627\u062f\u0645\u060c \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0627\u06af\u0631 \u0622\u0646 \u0631\u0627 \u0627\u0632 \u062f\u0633\u062a \u062f\u0627\u062f\u06cc\u062f \u06cc\u0627 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u062d\u0627\u0641\u0638\u0647 \u062e\u0648\u062f \u0631\u0627 \u062a\u0627\u0632\u0647 \u06a9\u0646\u06cc\u062f\u060c \u0622\u0646 \u0631\u0627 \u0628\u0631\u0631\u0633\u06cc \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0628\u0631\u0627\u06cc \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc\u060c \u0627\u0635\u0637\u0644\u0627\u062d\u0627\u062a &#8220;\u0645\u0646\u0637\u0642\u0647 \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc&#8221; \u0648 &#8220;\u0634\u0627\u062e\u0635&#8221; \u0642\u0627\u0628\u0644 \u062a\u0639\u0648\u06cc\u0636 \u0647\u0633\u062a\u0646\u062f \u0648 \u0647\u0631 \u062f\u0648 \u0628\u0647 \u0637\u0648\u0631 \u06af\u0633\u062a\u0631\u062f\u0647 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u0634\u0648\u0646\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/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-182.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-182\" width=\"796\" height=\"207\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a\u060c \u0648\u0636\u0639\u06cc\u062a \u062a\u06cc\u0631 \u06a9\u0627\u0631\u06cc \u0628\u0627 \u0648\u0636\u0639\u06cc\u062a \u0634\u0627\u062e\u0635 \u0648 \u0648\u0636\u0639\u06cc\u062a \u06cc\u06a9\u0633\u0627\u0646 \u0627\u0633\u062a <code>HEAD<\/code>.  (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u0628\u0631\u0627\u06cc \u0645\u0634\u0627\u0647\u062f\u0647 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u062f\u0627\u06cc\u0631 \u06a9\u0627\u0631\u06cc \u0648 \u0646\u0627\u062d\u06cc\u0647 \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc\u060c \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git diff<\/code>\u060c \u0628\u062f\u0648\u0646 \u0647\u06cc\u0686 \u06af\u0648\u0646\u0647 \u067e\u0631\u0686\u0645 \u0627\u0636\u0627\u0641\u06cc.<\/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-181.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-181\" width=\"789\" height=\"219\" loading=\"lazy\" title=\"\"><figcaption>\u0628\u062f\u0648\u0646 \u0633\u0648\u0626\u06cc\u0686\u060c <code>git diff<\/code> \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0645\u0646\u0637\u0642\u0647 \u0635\u062d\u0646\u0647 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0645\u06cc \u0628\u06cc\u0646\u06cc\u062f\u060c <code>git diff<\/code> \u0647\u0631 \u062f\u0648 \u0631\u0627 \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0641\u0647\u0631\u0633\u062a \u0645\u06cc \u06a9\u0646\u062f <code>file A<\/code> \u0648 <code>file B<\/code> \u0628\u0627 \u0627\u0634\u0627\u0631\u0647 \u0628\u0647 <code>my_file.py<\/code>.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 <code>file A<\/code> \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0628\u0647 \u0646\u0633\u062e\u0647 \u0627\u0634\u0627\u0631\u0647 \u062f\u0627\u0631\u062f <code>my_file.py<\/code> \u062f\u0631 \u0645\u0646\u0637\u0642\u0647 \u0635\u062d\u0646\u0647 \u0633\u0627\u0632\u06cc\u060c \u062f\u0631 \u062d\u0627\u0644\u06cc \u06a9\u0647 <code>file B<\/code> \u0628\u0647 \u0646\u0633\u062e\u0647 \u0622\u0646 \u062f\u0631 \u06a9\u0627\u0631\u06af\u0631\u062f\u0627\u0646\u06cc \u06a9\u0627\u0631 \u0627\u0634\u0627\u0631\u0647 \u062f\u0627\u0631\u062f.<\/p>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u0627\u06af\u0631 \u0627\u0635\u0644\u0627\u062d \u06a9\u0646\u06cc\u062f <code>my_file.py<\/code> \u062f\u0631 \u06cc\u06a9 \u0648\u06cc\u0631\u0627\u06cc\u0634\u06af\u0631 \u0645\u062a\u0646\u060c \u0648 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0630\u062e\u06cc\u0631\u0647 \u0646\u06a9\u0646\u06cc\u062f <code>git diff<\/code> \u0627\u0632 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u06a9\u0647 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u0647\u200c\u0627\u06cc\u062f \u0622\u06af\u0627\u0647 \u0646\u062e\u0648\u0627\u0647\u0646\u062f \u0628\u0648\u062f\u060c \u0632\u06cc\u0631\u0627 \u062f\u0631 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc \u06a9\u0627\u0631 \u0630\u062e\u06cc\u0631\u0647 \u0646\u0634\u062f\u0647\u200c\u0627\u0646\u062f.<\/p>\n<p>\u0686\u0646\u062f \u0633\u0648\u0626\u06cc\u0686 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f \u06a9\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u0628\u0647 \u0622\u0646\u0647\u0627 \u0627\u0631\u0627\u0626\u0647 \u062f\u0647\u06cc\u0645 <code>git diff<\/code> \u0628\u0631\u0627\u06cc \u0628\u062f\u0633\u062a \u0622\u0648\u0631\u062f\u0646 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u06a9\u0627\u0631\u06af\u0631\u062f\u0627\u0646\u06cc \u06a9\u0627\u0631\u06cc \u0648 \u06cc\u06a9 commit \u062e\u0627\u0635\u060c \u06cc\u0627 \u0628\u06cc\u0646 \u0642\u0633\u0645\u062a \u0635\u062d\u0646\u0647 \u0648 \u0622\u062e\u0631\u06cc\u0646 commit\u060c \u06cc\u0627 \u0628\u06cc\u0646 \u062f\u0648 commit \u0648 \u063a\u06cc\u0631\u0647.<\/p>\n<p>\u0627\u0628\u062a\u062f\u0627 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062c\u062f\u06cc\u062f \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f\u060c <code>new_file.txt<\/code>\u060c \u0648 \u0622\u0646 \u0631\u0627 \u0630\u062e\u06cc\u0631\u0647 \u06a9\u0646\u06cc\u062f.  \u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631 \u0641\u0627\u06cc\u0644 \u062f\u0631 dir \u06a9\u0627\u0631 \u0627\u0633\u062a \u0648 \u062f\u0631 \u0648\u0627\u0642\u0639 \u062f\u0631 Git \u0631\u062f\u06cc\u0627\u0628\u06cc \u0646\u0634\u062f\u0647 \u0627\u0633\u062a.<\/p>\n<p><!--kg-card-end: markdown--><\/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-183.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-183\" width=\"477\" height=\"89\" loading=\"lazy\" title=\"\"><figcaption>\u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062c\u062f\u06cc\u062f \u0633\u0627\u062f\u0647 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0630\u062e\u06cc\u0631\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a <code>new_file.txt<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062d\u0627\u0644\u0627 \u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0645\u0631\u062d\u0644\u0647 \u0648 commit \u06a9\u0646\u06cc\u062f:<br \/>\n<code>git add new_file.txt<\/code><br \/>\n<code>git commit -m \"new file!\"<\/code><\/p>\n<p><!--kg-card-end: markdown--><!--kg-card-begin: markdown--><\/p>\n<p>\u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631\u060c \u0648\u0636\u0639\u06cc\u062a <code>HEAD<\/code> \u0645\u0627\u0646\u0646\u062f \u0648\u0636\u0639\u06cc\u062a \u0645\u0646\u0637\u0642\u0647 \u0627\u0633\u062a\u0642\u0631\u0627\u0631 \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u062f\u0631\u062e\u062a \u06a9\u0627\u0631 \u0627\u0633\u062a:<\/p>\n<p><!--kg-card-end: markdown--><\/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-184.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-184\" width=\"792\" height=\"219\" loading=\"lazy\" title=\"\"><figcaption>\u0648\u0636\u0639\u06cc\u062a <code>HEAD<\/code> \u0647\u0645\u0627\u0646 \u0634\u0627\u062e\u0635 \u0648 \u062f\u0627\u06cc\u0631 \u06a9\u0627\u0631\u06cc \u0627\u0633\u062a (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0639\u062f\u060c \u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0646\u06cc\u062f <code>new_file.txt<\/code>\u060c \u0628\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u062f\u0631 \u0627\u0628\u062a\u062f\u0627 \u0648 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u062f\u06cc\u06af\u0631 \u062f\u0631 \u067e\u0627\u06cc\u0627\u0646:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-185.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-185\" width=\"478\" height=\"136\" loading=\"lazy\" title=\"\"><figcaption>\u062f\u0631 \u062d\u0627\u0644 \u0627\u0635\u0644\u0627\u062d <code>new_file.txt<\/code> \u0628\u0627 \u0627\u0641\u0632\u0648\u062f\u0646 \u06cc\u06a9 \u062e\u0637 \u062f\u0631 \u0627\u0628\u062a\u062f\u0627 \u0648 \u062f\u06cc\u06af\u0631\u06cc \u062f\u0631 \u067e\u0627\u06cc\u0627\u0646 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0631 \u0646\u062a\u06cc\u062c\u0647 \u0648\u0636\u0639\u06cc\u062a \u0628\u0647 \u0634\u0631\u062d \u0632\u06cc\u0631 \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-186.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-186\" width=\"788\" height=\"198\" loading=\"lazy\" title=\"\"><figcaption>\u067e\u0633 \u0627\u0632 \u0630\u062e\u06cc\u0631\u0647\u060c \u0648\u0636\u0639\u06cc\u062a \u062f\u0631 \u0645\u0633\u06cc\u0631 \u06a9\u0627\u0631\u06cc \u0628\u0627 \u0648\u0636\u0639\u06cc\u062a \u0634\u0627\u062e\u0635 \u06cc\u0627 \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a <code>HEAD<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u06cc\u06a9 \u062a\u0631\u0641\u0646\u062f \u062e\u0648\u0628 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0622\u0646 \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f <code>git add -p<\/code>\u060c \u06a9\u0647 \u0628\u0647 \u0634\u0645\u0627 \u0627\u0645\u06a9\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0631\u0627 \u062d\u062a\u06cc \u062f\u0631 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062a\u0642\u0633\u06cc\u0645 \u06a9\u0646\u06cc\u062f \u0648 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f \u06a9\u0647 \u06a9\u062f\u0627\u0645 \u06cc\u06a9 \u0631\u0627 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0631 \u0627\u06cc\u0646 \u0645\u0648\u0631\u062f\u060c \u062e\u0637 \u0627\u0648\u0644 \u0631\u0627 \u0628\u0647 \u0641\u0647\u0631\u0633\u062a \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f\u060c \u0627\u0645\u0627 \u062e\u0637 \u0622\u062e\u0631 \u0631\u0627 \u0646\u0647.  \u0628\u0631\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0627\u06cc\u0646 \u06a9\u0627\u0631\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0686\u0646\u06af\u06a9 \u0631\u0627 \u062a\u0642\u0633\u06cc\u0645 \u06a9\u0646\u06cc\u062f <code>s<\/code>\u060c \u0633\u067e\u0633 \u0628\u067e\u0630\u06cc\u0631\u06cc\u062f \u06a9\u0647 \u0627\u0648\u0644\u06cc\u0646 \u0647\u0627\u0646\u06a9 (\u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>y<\/code>) \u0648 \u0646\u0647 \u0642\u0633\u0645\u062a \u062f\u0648\u0645 (\u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>n<\/code>).<\/p>\n<p>\u0627\u06af\u0631 \u0645\u0637\u0645\u0626\u0646 \u0646\u06cc\u0633\u062a\u06cc\u062f \u06a9\u0647 \u0647\u0631 \u062d\u0631\u0641 \u0645\u062e\u0641\u0641 \u0686\u06cc\u0633\u062a\u060c \u0647\u0645\u06cc\u0634\u0647 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0632 a \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>?<\/code> \u0648 Git \u0628\u0647 \u0634\u0645\u0627 \u062e\u0648\u0627\u0647\u062f \u06af\u0641\u062a.<\/p>\n<p><!--kg-card-end: markdown--><\/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-187.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-187\" width=\"658\" height=\"566\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0646 <code>git add -p<\/code>\u060c \u0641\u0642\u0637 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0648\u0644\u06cc\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0631\u0627 \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc \u06a9\u0646\u06cc\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631 \u062f\u0648\u0644\u062a \u062f\u0631 <code>HEAD<\/code> \u0628\u062f\u0648\u0646 \u0647\u06cc\u0686 \u06cc\u06a9 \u0627\u0632 \u0622\u0646 \u062e\u0637\u0648\u0637 \u062c\u062f\u06cc\u062f \u0627\u0633\u062a.  \u062f\u0631 \u0642\u0633\u0645\u062a \u0635\u062d\u0646\u0647\u060c \u062e\u0637 \u0627\u0648\u0644 \u0631\u0627 \u062f\u0627\u0631\u06cc\u0645 \u0627\u0645\u0627 \u062e\u0637 \u0622\u062e\u0631 \u0631\u0627 \u0646\u062f\u0627\u0631\u06cc\u0645\u060c \u0648 \u062f\u0631 \u0642\u0633\u0645\u062a \u06a9\u0627\u0631\u06cc \u0647\u0631 \u062f\u0648 \u062e\u0637 \u062c\u062f\u06cc\u062f \u0631\u0627 \u062f\u0627\u0631\u06cc\u0645.<\/p>\n<p><!--kg-card-end: markdown--><\/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-189.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-189\" width=\"783\" height=\"207\" loading=\"lazy\" title=\"\"><figcaption>\u0648\u0636\u0639\u06cc\u062a \u067e\u0633 \u0627\u0632 \u0627\u062c\u0631\u0627\u06cc \u062a\u0646\u0647\u0627 \u062e\u0637 \u0627\u0648\u0644 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0627\u06af\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u062f <code>git diff<\/code>\u060c \u0686\u0647 \u0627\u062a\u0641\u0627\u0642\u06cc \u062e\u0648\u0627\u0647\u062f \u0627\u0641\u062a\u0627\u062f\u061f<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-188.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-188\" width=\"413\" height=\"240\" loading=\"lazy\" title=\"\"><figcaption><code>git diff<\/code>  \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0634\u0627\u062e\u0635 \u0648 \u0645\u0633\u06cc\u0631 \u06a9\u0627\u0631\u06cc \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062e\u0648\u0628\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u0642\u0628\u0644\u0627\u064b \u06af\u0641\u062a\u0647 \u0634\u062f\u060c \u0634\u0645\u0627 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0646\u0627\u062d\u06cc\u0647 \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc \u0648 \u062f\u0631\u062e\u062a \u06a9\u0627\u0631 \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u0645\u06cc \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0686\u0647 \u0627\u062a\u0641\u0627\u0642\u06cc \u0645\u06cc \u0627\u0641\u062a\u062f \u0627\u06af\u0631 \u0628\u062e\u0648\u0627\u0647\u06cc\u062f \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0627\u06cc\u0646 \u062f\u0648 \u0631\u0627 \u0628\u062f\u0633\u062a \u0622\u0648\u0631\u06cc\u062f <code>HEAD<\/code> \u0648 \u0645\u0646\u0637\u0642\u0647 \u0635\u062d\u0646\u0647\u061f  \u0628\u0631\u0627\u06cc \u0622\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f <code>git diff \u2013cached<\/code>:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-190.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-190\" width=\"406\" height=\"193\" loading=\"lazy\" title=\"\"><figcaption><code>git diff --cached<\/code>  \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f <code>HEAD<\/code> \u0648 \u0634\u0627\u062e\u0635 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0648 \u0627\u06af\u0631 \u0628\u062e\u0648\u0627\u0647\u06cc\u0645 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0627\u06cc\u0646 \u062f\u0648 \u0631\u0627 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u0645 \u0686\u0647 \u0645\u06cc \u0634\u0648\u062f <code>HEAD<\/code> \u0648 \u062f\u0631\u062e\u062a \u06a9\u0627\u0631\u061f  \u0628\u0631\u0627\u06cc \u0622\u0646 \u0645\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u0645 <code>git diff HEAD<\/code>:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-191.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-191\" width=\"415\" height=\"192\" loading=\"lazy\" title=\"\"><figcaption><code>git diff HEAD<\/code>  \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f <code>HEAD<\/code> and the work dir (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0631\u0627\u06cc \u062e\u0644\u0627\u0635\u0647 \u06a9\u0631\u062f\u0646 \u0633\u0648\u0626\u06cc\u0686 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0628\u0631\u0627\u06cc <code>git diff<\/code>\u060c \u0627\u06cc\u0646 \u0646\u0645\u0648\u062f\u0627\u0631 \u0631\u0627 \u0628\u0628\u06cc\u0646\u06cc\u062f \u06a9\u0647 \u062f\u0631 \u0635\u0648\u0631\u062a \u0646\u06cc\u0627\u0632 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u0631\u062c\u0639 \u0628\u0647 \u0622\u0646 \u0628\u0627\u0632\u06af\u0631\u062f\u06cc\u062f:<\/p>\n<p><!--kg-card-end: markdown--><\/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-192.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-192\" width=\"794\" height=\"285\" loading=\"lazy\" title=\"\"><figcaption>\u0633\u0648\u0626\u06cc\u0686 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0628\u0631\u0627\u06cc <code>git diff<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc\u060c \u062f\u0631 \u0627\u0628\u062a\u062f\u0627\u06cc \u0627\u06cc\u0646 \u067e\u0633\u062a \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u06cc\u062f <code>git diff -\u2013no-index<\/code>.  \u0628\u0627 <code>--no-index<\/code> \u0633\u0648\u0626\u06cc\u0686 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u062f\u0648 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u06a9\u0647 \u0628\u062e\u0634\u06cc \u0627\u0632 \u0645\u062e\u0632\u0646 &#8211; \u06cc\u0627 \u0647\u0631 \u0645\u0646\u0637\u0642\u0647 \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc \u0646\u06cc\u0633\u062a\u0646\u062f &#8211; \u0645\u0642\u0627\u06cc\u0633\u0647 \u06a9\u0646\u06cc\u062f.<\/p>\n<p>\u0627\u06a9\u0646\u0648\u0646\u060c \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u0631\u0627 \u06a9\u0647 \u062f\u0631 \u0642\u0633\u0645\u062a \u0645\u0631\u062d\u0644\u0647 \u0628\u0646\u062f\u06cc \u062f\u0627\u0631\u06cc\u062f\u060c \u0627\u0646\u062c\u0627\u0645 \u062f\u0647\u06cc\u062f:<\/p>\n<p><code>git commit -m \"added a first line\"<\/code><\/p>\n<p>\u0628\u0631\u0627\u06cc \u0645\u0634\u0627\u0647\u062f\u0647 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0627\u06cc\u0646 commit \u0648 commit \u0648\u0627\u0644\u062f \u0622\u0646\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u062f\u0633\u062a\u0648\u0631 \u0632\u06cc\u0631 \u0631\u0627 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git diff HEAD~1 HEAD<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-194.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-194\" width=\"414\" height=\"196\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff HEAD~1 HEAD<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0647 \u0647\u0631 \u062d\u0627\u0644\u060c \u0645\u0627 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u062d\u0630\u0641 \u06a9\u0646\u06cc\u0645 <code>1<\/code> \u0628\u0627\u0644\u0627 \u0648 \u0628\u0646\u0648\u06cc\u0633 <code>HEAD~<\/code>\u060c \u0648 \u0647\u0645\u06cc\u0646 \u0646\u062a\u06cc\u062c\u0647 \u0631\u0627 \u0628\u06af\u06cc\u0631\u06cc\u062f.  \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0646 <code>1<\/code> \u0631\u0627\u0647\u06cc \u0635\u0631\u06cc\u062d \u0628\u0631\u0627\u06cc \u0628\u06cc\u0627\u0646 \u0627\u06cc\u0646\u06a9\u0647 \u0634\u0645\u0627 \u0628\u0647 \u0648\u0627\u0644\u062f \u0627\u0648\u0644 commit \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u06cc\u062f \u0627\u0633\u062a.<\/p>\n<p>\u062a\u0648\u062c\u0647 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u0646\u0648\u0634\u062a\u0646 commit \u0648\u0627\u0644\u062f \u062f\u0631 \u0627\u06cc\u0646\u062c\u0627\u060c <code>HEAD~1<\/code>\u060c \u0627\u0628\u062a\u062f\u0627 \u06cc\u06a9 \u062a\u0641\u0627\u0648\u062a \u0631\u0627 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f \u06a9\u0647 \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f \u0686\u06af\u0648\u0646\u0647 \u0627\u0632 \u062a\u0639\u0647\u062f \u0648\u0627\u0644\u062f \u0628\u0647 \u062a\u0639\u0647\u062f \u0641\u0639\u0644\u06cc \u0628\u0631\u0633\u06cc\u0645.  \u0627\u0644\u0628\u062a\u0647\u060c \u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u0645 \u0628\u0627 \u0646\u0648\u0634\u062a\u0646 \u062a\u0641\u0627\u0648\u062a \u0645\u0639\u06a9\u0648\u0633 \u0631\u0627 \u0646\u06cc\u0632 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u0645:<\/p>\n<p><code>git diff HEAD HEAD~1<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-195.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-195\" width=\"407\" height=\"193\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff HEAD HEAD~1<\/code> \u067e\u0686 \u0645\u0639\u06a9\u0648\u0633 \u0631\u0627 \u062a\u0648\u0644\u06cc\u062f \u0645\u06cc \u06a9\u0646\u062f (\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\/1703594233_98_image-196.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-196\" width=\"799\" height=\"368\" loading=\"lazy\" title=\"\"><figcaption>\u0633\u0648\u0626\u06cc\u0686 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0628\u0631\u0627\u06cc <code>git diff<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u06cc\u06a9 \u0631\u0627\u0647 \u06a9\u0648\u062a\u0627\u0647 \u0628\u0631\u0627\u06cc \u0645\u0634\u0627\u0647\u062f\u0647 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u06cc\u06a9 commit \u0648 \u0648\u0627\u0644\u062f \u0622\u0646\u060c \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0622\u0646 \u0627\u0633\u062a <code>git show<\/code>\u060c \u0645\u062b\u0644\u0627:<\/p>\n<p><code>git show HEAD<\/code><\/p>\n<p>\u0627\u06cc\u0646 \u0647\u0645\u0627\u0646 \u0646\u0648\u0634\u062a\u0646 \u0627\u0633\u062a:<\/p>\n<p><code>git diff HEAD~ HEAD<\/code><\/p>\n<p>\u0627\u06a9\u0646\u0648\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u0645 \u0646\u0645\u0648\u062f\u0627\u0631 \u062e\u0648\u062f \u0631\u0627 \u0628\u0647 \u0631\u0648\u0632 \u06a9\u0646\u06cc\u0645:<\/p>\n<p><!--kg-card-end: markdown--><\/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\/1703594234_849_image-197.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-197\" width=\"473\" height=\"76\" loading=\"lazy\" title=\"\"><figcaption>\u0645\u0637\u0627\u0644\u0628 \u0627\u0632 <code>new_file.txt<\/code> \u067e\u0633 \u0627\u0632 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 <code>git reset --hard HEAD~1<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u0627\u062f\u0622\u0648\u0631\u06cc\u060c commit \u0647\u0627\u06cc Git \u0639\u06a9\u0633 \u0647\u0627\u06cc \u0641\u0648\u0631\u06cc \u0647\u0633\u062a\u0646\u062f &#8211; \u0627\u0632 \u06a9\u0644 \u0641\u0647\u0631\u0633\u062a \u06a9\u0627\u0631\u06cc \u0645\u062e\u0632\u0646\u060c \u062f\u0631 \u06cc\u06a9 \u0646\u0642\u0637\u0647 \u062e\u0627\u0635 \u0627\u0632 \u0632\u0645\u0627\u0646.  \u0628\u0627 \u0627\u06cc\u0646 \u062d\u0627\u0644\u060c \u06af\u0627\u0647\u06cc \u0627\u0648\u0642\u0627\u062a \u0628\u0633\u06cc\u0627\u0631 \u0645\u0641\u06cc\u062f \u0646\u06cc\u0633\u062a \u06a9\u0647 \u06cc\u06a9 commit \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06cc\u06a9 \u0639\u06a9\u0633 \u0641\u0648\u0631\u06cc \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u0645\u060c \u0628\u0644\u06a9\u0647 \u0628\u06cc\u0634\u062a\u0631 \u0628\u0627 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u06cc \u06a9\u0647 \u0627\u06cc\u0646 commit \u062e\u0627\u0635 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u0645\u0641\u06cc\u062f \u0627\u0633\u062a.  \u0628\u0647 \u0639\u0628\u0627\u0631\u062a \u062f\u06cc\u06af\u0631\u060c \u062a\u0648\u0633\u0637 <strong>\u062a\u0641\u0627\u0648\u062a<\/strong> \u0628\u06cc\u0646 \u06cc\u06a9 \u0645\u062a\u0639\u0647\u062f \u0648\u0627\u0644\u062f\u06cc\u0646 \u0628\u0647 \u062a\u0639\u0647\u062f \u0628\u0639\u062f\u06cc.<\/p>\n<p>\u0647\u0646\u0648\u0632 \u0645\u0647\u0645 \u0627\u0633\u062a \u06a9\u0647 \u0628\u0647 \u06cc\u0627\u062f \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 Git \u06a9\u0644 \u0639\u06a9\u0633 \u0647\u0627\u06cc \u0641\u0648\u0631\u06cc \u0631\u0627 \u0630\u062e\u06cc\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f \u0648 \u062a\u0641\u0627\u0648\u062a \u0628\u0647 \u0635\u0648\u0631\u062a \u067e\u0648\u06cc\u0627 \u0627\u0632 \u062f\u0627\u062f\u0647 \u0647\u0627\u06cc \u0639\u06a9\u0633 \u0641\u0648\u0631\u06cc &#8211; \u0628\u0627 \u0645\u0642\u0627\u06cc\u0633\u0647 \u062f\u0631\u062e\u062a\u0627\u0646 \u0631\u06cc\u0634\u0647 commit \u0648 \u0648\u0627\u0644\u062f \u0622\u0646 \u062a\u0648\u0644\u06cc\u062f \u0645\u06cc \u0634\u0648\u062f.<\/p>\n<p>\u0627\u0644\u0628\u062a\u0647\u060c Git \u0645\u06cc\u200c\u062a\u0648\u0627\u0646\u062f \u0647\u0631 \u062f\u0648 \u0639\u06a9\u0633 \u0641\u0648\u0631\u06cc \u0631\u0627 \u062f\u0631 \u0632\u0645\u0627\u0646 \u0645\u0642\u0627\u06cc\u0633\u0647 \u06a9\u0646\u062f\u060c \u0646\u0647 \u0641\u0642\u0637 commit\u200c\u0647\u0627\u06cc \u0645\u062c\u0627\u0648\u0631\u060c \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u0641\u0627\u06cc\u0644\u200c\u0647\u0627\u06cc \u0645\u062a\u0641\u0627\u0648\u062a\u06cc \u0631\u0627 \u06a9\u0647 \u062f\u0631 \u06cc\u06a9 \u0645\u062e\u0632\u0646 \u06af\u0646\u062c\u0627\u0646\u062f\u0647 \u0646\u0634\u062f\u0647\u200c\u0627\u0646\u062f\u060c \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<h2 id=\"how-to-apply-patches-\"><span class=\"ez-toc-section\" id=\"%d9%86%d8%ad%d9%88%d9%87_%d8%a7%d8%b9%d9%85%d8%a7%d9%84_%d9%be%da%86_%d9%87%d8%a7_%f0%9f%92%aa%f0%9f%8f%bb\"><\/span>\u0646\u062d\u0648\u0647 \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0647\u0627 \ud83d\udcaa\ud83c\udffb<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>git diff<\/code> \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u067e\u0686 \u0631\u0627 \u0628\u0628\u06cc\u0646\u06cc\u062f \u0648 \u0633\u067e\u0633 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u06cc\u0646 \u067e\u0686 \u0631\u0627 \u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0622\u0646 \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u06cc\u062f <code>git apply<\/code>.<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<h3 id=\"historical-note-\"><span class=\"ez-toc-section\" id=\"%db%8c%d8%a7%d8%af%d8%af%d8%a7%d8%b4%d8%aa_%d8%aa%d8%a7%d8%b1%db%8c%d8%ae%db%8c_%f0%9f%93%94\"><\/span>\u06cc\u0627\u062f\u062f\u0627\u0634\u062a \u062a\u0627\u0631\u06cc\u062e\u06cc \ud83d\udcd4<span class=\"ez-toc-section-end\"><\/span><\/h3>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062f\u0631 \u0648\u0627\u0642\u0639\u060c \u0628\u0647 \u0627\u0634\u062a\u0631\u0627\u06a9 \u06af\u0630\u0627\u0631\u06cc \u0648\u0635\u0644\u0647 \u0647\u0627\u060c \u0631\u0627\u0647 \u0627\u0635\u0644\u06cc \u0628\u0631\u0627\u06cc \u0627\u0634\u062a\u0631\u0627\u06a9 \u06af\u0630\u0627\u0631\u06cc \u06a9\u062f \u062f\u0631 \u0631\u0648\u0632\u0647\u0627\u06cc \u0627\u0648\u0644\u06cc\u0647 \u0645\u0646\u0628\u0639 \u0628\u0627\u0632 \u0628\u0648\u062f.  \u0627\u0645\u0627 \u0627\u06a9\u0646\u0648\u0646 &#8211; \u062a\u0642\u0631\u06cc\u0628\u0627\u064b \u0647\u0645\u0647 \u067e\u0631\u0648\u0698\u0647\u200c\u0647\u0627 \u0645\u0633\u062a\u0642\u06cc\u0645\u0627\u064b \u0627\u0632 \u0637\u0631\u06cc\u0642 \u062f\u0631\u062e\u0648\u0627\u0633\u062a\u200c\u0647\u0627\u06cc \u06a9\u0634\u0634 (\u06a9\u0647 \u062f\u0631 \u0628\u0631\u062e\u06cc \u0627\u0632 \u067e\u0644\u062a\u0641\u0631\u0645\u200c\u0647\u0627 \u00ab\u062f\u0631\u062e\u0648\u0627\u0633\u062a\u200c\u0647\u0627\u06cc \u0627\u062f\u063a\u0627\u0645\u00bb \u0646\u0627\u0645\u06cc\u062f\u0647 \u0645\u06cc\u200c\u0634\u0648\u0646\u062f) \u0628\u0647 \u0627\u0634\u062a\u0631\u0627\u06a9\u200c\u06af\u0630\u0627\u0631\u06cc \u062a\u0639\u0647\u062f\u0627\u062a Git \u0631\u0641\u062a\u0647\u200c\u0627\u0646\u062f.<\/p>\n<p>\u0628\u0632\u0631\u06af\u062a\u0631\u06cc\u0646 \u0645\u0634\u06a9\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0648\u0635\u0644\u0647 \u0647\u0627 \u0627\u06cc\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0648\u0642\u062a\u06cc \u067e\u0648\u0634\u0647 \u06a9\u0627\u0631\u06cc \u0634\u0645\u0627 \u0628\u0627 commit \u0642\u0628\u0644\u06cc \u0641\u0631\u0633\u062a\u0646\u062f\u0647 \u0645\u0637\u0627\u0628\u0642\u062a \u0646\u062f\u0627\u0631\u062f\u060c \u0627\u0639\u0645\u0627\u0644 \u06cc\u06a9 \u0648\u0635\u0644\u0647 \u0633\u062e\u062a \u0627\u0633\u062a.<\/p>\n<p>\u0627\u0632 \u062f\u0633\u062a \u062f\u0627\u062f\u0646 \u062a\u0627\u0631\u06cc\u062e\u0686\u0647 \u062a\u0639\u0647\u062f\u060c \u062d\u0644 \u0648 \u0641\u0635\u0644 \u062f\u0631\u06af\u06cc\u0631\u06cc \u0647\u0627 \u0631\u0627 \u062f\u0634\u0648\u0627\u0631 \u0645\u06cc \u06a9\u0646\u062f.  \u0628\u0627 \u063a\u0648\u0637\u0647 \u0648\u0631 \u0634\u062f\u0646 \u0639\u0645\u06cc\u0642 \u062a\u0631 \u062f\u0631 \u0641\u0631\u0622\u06cc\u0646\u062f \u0622\u0646\u060c \u0628\u0647\u062a\u0631 \u0622\u0646 \u0631\u0627 \u062f\u0631\u06a9 \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f <code>git apply<\/code>.<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<h3 id=\"a-simple-apply\"><span class=\"ez-toc-section\" id=\"%db%8c%da%a9_%d8%af%d8%b1%d8%ae%d9%88%d8%a7%d8%b3%d8%aa_%d8%b3%d8%a7%d8%af%d9%87\"><\/span>\u06cc\u06a9 \u062f\u0631\u062e\u0648\u0627\u0633\u062a \u0633\u0627\u062f\u0647<span class=\"ez-toc-section-end\"><\/span><\/h3>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0628\u0647 \u0686\u0647 \u0645\u0639\u0646\u0627\u0633\u062a\u061f  \u0648\u0642\u062a \u0622\u0646 \u0627\u0633\u062a \u06a9\u0647 \u0622\u0646 \u0631\u0627 \u0627\u0645\u062a\u062d\u0627\u0646 \u06a9\u0646\u06cc\u062f!<\/p>\n<p>\u062e\u0631\u0648\u062c\u06cc \u0627\u0632 <code>git diff<\/code>:<\/p>\n<p><code>git diff HEAD~1 HEAD<\/code><\/p>\n<p>\u0648 \u0622\u0646 \u0631\u0627 \u062f\u0631 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0630\u062e\u06cc\u0631\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git diff HEAD~1 HEAD &gt; my_patch.patch<\/code><\/p>\n<p>\u0648 <code>reset<\/code> \u0628\u0631\u0627\u06cc \u0644\u063a\u0648 \u0622\u062e\u0631\u06cc\u0646 commit:<\/p>\n<p><code>git reset \u2013hard HEAD~1<\/code><\/p>\n<p>\u0627\u06af\u0631 \u06a9\u0627\u0645\u0644\u0627 \u0631\u0627\u062d\u062a \u0646\u06cc\u0633\u062a\u06cc\u062f <code>git reset<\/code>\u060c \u067e\u0633\u062a \u0642\u0628\u0644\u06cc \u0631\u0627 \u06a9\u0647 \u0628\u0647 \u0637\u0648\u0631 \u0639\u0645\u06cc\u0642 \u0628\u0647 \u0622\u0646 \u067e\u0631\u062f\u0627\u062e\u062a\u0647 \u0627\u0633\u062a \u0631\u0627 \u0628\u0631\u0631\u0633\u06cc \u06a9\u0646\u06cc\u062f.  \u0628\u0647 \u0637\u0648\u0631 \u062e\u0644\u0627\u0635\u0647\u060c \u0628\u0647 \u0645\u0627 \u0627\u06cc\u0646 \u0627\u0645\u06a9\u0627\u0646 \u0631\u0627 \u0645\u06cc \u062f\u0647\u062f \u06a9\u0647 \u0648\u0636\u0639\u06cc\u062a \u0645\u06a9\u0627\u0646 \u0631\u0627 &#8220;\u0628\u0627\u0632\u0646\u0634\u0627\u0646\u06cc&#8221; \u06a9\u0646\u06cc\u0645 <code>HEAD<\/code> \u0627\u0634\u0627\u0631\u0647 \u0645\u06cc \u06a9\u0646\u062f\u060c \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u0648\u0636\u0639\u06cc\u062a \u0634\u0627\u062e\u0635 \u0648 \u06a9\u0627\u0631\u06af\u0631\u062f\u0627\u0646\u06cc \u06a9\u0627\u0631.<\/p>\n<p>\u062f\u0631 \u0645\u062b\u0627\u0644 \u0628\u0627\u0644\u0627\u060c \u0647\u0645\u0647 \u0622\u0646\u0647\u0627 \u0631\u0648\u06cc \u062d\u0627\u0644\u062a \u062a\u0646\u0638\u06cc\u0645 \u0634\u062f\u0647 \u0627\u0646\u062f <code>HEAD~1<\/code>\u060c \u06cc\u0627 <code>Commit 3<\/code> \u062f\u0631 \u0646\u0645\u0648\u062f\u0627\u0631<\/p>\n<p>\u067e\u0633 \u067e\u0633 \u0627\u0632 \u0627\u062c\u0631\u0627\u06cc \u062f\u0633\u062a\u0648\u0631 reset \u0645\u062d\u062a\u0648\u06cc\u0627\u062a \u0641\u0627\u06cc\u0644 \u0628\u0647 \u0635\u0648\u0631\u062a \u0632\u06cc\u0631 \u0627\u0633\u062a:<\/p>\n<p><code>nano new_file.txt<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594234_147_image-198.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-198\" width=\"499\" height=\"217\" loading=\"lazy\" title=\"\"><figcaption>\u0648\u0635\u0644\u0647 \u0627\u06cc \u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u06cc\u062f\u060c \u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 \u062a\u0648\u0633\u0637 \u0622\u0646 \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u0627\u0633\u062a <code>git diff<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0648 \u0645\u0627 \u0627\u06cc\u0646 \u067e\u0686 \u0631\u0627 \u0627\u0639\u0645\u0627\u0644 \u062e\u0648\u0627\u0647\u06cc\u0645 \u06a9\u0631\u062f:<\/p>\n<p><code>nano my_patch.patch<\/code><\/p>\n<p>\u0627\u06cc\u0646 \u067e\u0686 \u0628\u0647 git \u0645\u06cc \u06af\u0648\u06cc\u062f \u06a9\u0647 \u062e\u0637\u0648\u0637 \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u062f:<\/p>\n<pre><code class=\"language-txt\">This is a new file\nWith new content!\n<\/code><\/pre>\n<p>\u0627\u06cc\u0646 \u0642\u0628\u0644\u0627\u064b \u062e\u0637\u0648\u0637 \u0628\u0648\u062f <code>1<\/code> \u0648 <code>2<\/code>\u060c \u0648 \u06cc\u06a9 \u062e\u0637 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f <code>START<\/code> \u062f\u0631\u0633\u062a \u0628\u0627\u0644\u0627\u06cc \u0622\u0646\u0647\u0627<\/p>\n<p>\u0627\u06cc\u0646 \u062f\u0633\u062a\u0648\u0631 \u0631\u0627 \u0628\u0631\u0627\u06cc \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git apply my_patch.patch<\/code><\/p>\n<p>\u0648 \u062f\u0631 \u0646\u062a\u06cc\u062c\u0647\u060c \u0627\u06cc\u0646 \u0646\u0633\u062e\u0647 \u0627\u0632 \u0641\u0627\u06cc\u0644 \u062e\u0648\u062f \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u0645\u06cc \u06a9\u0646\u06cc\u062f\u060c \u062f\u0631\u0633\u062a \u0645\u0627\u0646\u0646\u062f commit \u06a9\u0647 \u0642\u0628\u0644\u0627 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u0647 \u0627\u06cc\u062f:<\/p>\n<p><code>nano new_file.txt<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594235_912_image-199.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-199\" width=\"459\" height=\"106\" loading=\"lazy\" title=\"\"><figcaption>\u0645\u0637\u0627\u0644\u0628 \u0627\u0632 <code>new_file.txt<\/code> \u067e\u0633 \u0627\u0632 \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<h2 id=\"understanding-the-context-lines-\"><span class=\"ez-toc-section\" id=\"%d8%af%d8%b1%da%a9_%d8%ae%d8%b7%d9%88%d8%b7_%d8%b2%d9%85%db%8c%d9%86%d9%87_%f0%9f%a7%91%f0%9f%8f%bb%e2%80%8d%f0%9f%8f%ab\"><\/span>\u062f\u0631\u06a9 \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \ud83e\uddd1\ud83c\udffb\u200d\ud83c\udfeb<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0631\u0627\u06cc \u062f\u0631\u06a9 \u0627\u0647\u0645\u06cc\u062a \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647\u060c \u0633\u0646\u0627\u0631\u06cc\u0648\u06cc \u067e\u06cc\u0634\u0631\u0641\u062a\u0647 \u062a\u0631\u06cc \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f.  \u0686\u0647 \u0627\u062a\u0641\u0627\u0642\u06cc \u0645\u06cc \u0627\u0641\u062a\u062f \u0627\u06af\u0631 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637\u0648\u0637 \u0627\u0632 \u0632\u0645\u0627\u0646 \u0627\u06cc\u062c\u0627\u062f \u0641\u0627\u06cc\u0644 \u067e\u0686 \u062a\u063a\u06cc\u06cc\u0631 \u06a9\u0631\u062f\u0647 \u0628\u0627\u0634\u062f\u061f  \ud83e\udd14<\/p>\n<p>\u0628\u0631\u0627\u06cc \u0622\u0632\u0645\u0627\u06cc\u0634\u060c \u0628\u0627 \u0627\u06cc\u062c\u0627\u062f \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062f\u06cc\u06af\u0631 \u0634\u0631\u0648\u0639 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594236_398_image-201.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-201\" width=\"481\" height=\"212\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u06cc\u062c\u0627\u062f \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u062f\u06cc\u06af\u0631 &#8211; <code>another_file.txt<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\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<p><code>git add another_file.txt<\/code><\/p>\n<p><code>git commit -m \"another file\"<\/code><\/p>\n<p>\u062d\u0627\u0644\u0627 \u0627\u06cc\u0646 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0628\u0627 \u0627\u0641\u0632\u0648\u062f\u0646 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u0648 \u0647\u0645\u0686\u0646\u06cc\u0646 \u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u062e\u0637 \u0642\u0628\u0644 \u0627\u0632 \u0622\u062e\u0631\u06cc\u0646 \u0622\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0647\u06cc\u062f:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594237_39_image-202.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-202\" width=\"503\" height=\"195\" loading=\"lazy\" title=\"\"><figcaption>\u062a\u063a\u06cc\u06cc\u0631\u0627\u062a <code>another_file.txt<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 \u0646\u0633\u062e\u0647 \u0627\u0635\u0644\u06cc \u0641\u0627\u06cc\u0644 \u0648 \u0646\u0633\u062e\u0647 \u0634\u0627\u0645\u0644 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u062e\u0648\u062f \u0631\u0627 \u0645\u0634\u0627\u0647\u062f\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git diff -- another_file.txt<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594239_459_image-203.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-203\" width=\"492\" height=\"321\" loading=\"lazy\" title=\"\"><figcaption>\u062e\u0631\u0648\u062c\u06cc \u0628\u0631\u0627\u06cc <code>git diff -- another_file.txt<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>(\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0631\u062f\u0646 <code>-- another_file.txt<\/code> \u0628\u0647 Git \u0645\u06cc \u06af\u0648\u06cc\u062f \u06a9\u0647 \u062f\u0633\u062a\u0648\u0631 \u0631\u0627 \u0627\u062c\u0631\u0627 \u06a9\u0646\u062f <code>diff<\/code>\u060c \u0641\u0642\u0637 \u0628\u0627 \u062f\u0631 \u0646\u0638\u0631 \u06af\u0631\u0641\u062a\u0646 <code>another_file.txt<\/code>\u060c \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u062a\u0641\u0627\u0648\u062a \u0641\u0627\u06cc\u0644 \u0647\u0627\u06cc \u062f\u06cc\u06af\u0631 \u0631\u0627 \u062f\u0631\u06cc\u0627\u0641\u062a \u0646\u0645\u06cc \u06a9\u0646\u06cc\u062f.)<\/p>\n<p>\u0627\u06cc\u0646 \u062a\u0641\u0627\u0648\u062a \u0631\u0627 \u062f\u0631 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u067e\u0686 \u0630\u062e\u06cc\u0631\u0647 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git diff -- another_file.txt &gt; new_patch.patch<\/code><\/p>\n<p>\u062d\u0627\u0644\u060c \u0642\u0628\u0644 \u0627\u0632 \u0627\u0639\u0645\u0627\u0644 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a\u060c \u062d\u0627\u0644\u062a \u062e\u0648\u062f \u0631\u0627 \u0628\u0647 \u062d\u0627\u0644\u062a \u0627\u0648\u0644\u06cc\u0647 \u0628\u0627\u0632\u0646\u0634\u0627\u0646\u06cc \u06a9\u0646\u06cc\u062f:<br \/>\n<code>git reset --hard<\/code><\/p>\n<p>\u0627\u06af\u0631 \u0642\u0631\u0627\u0631 \u0628\u0648\u062f \u062f\u0631\u062e\u0648\u0627\u0633\u062a \u0628\u062f\u0647\u06cc\u062f <code>new_patch.patch<\/code> \u062f\u0631 \u062d\u0627\u0644 \u062d\u0627\u0636\u0631\u060c \u0622\u0646 \u0631\u0627 \u0628\u0647 \u0633\u0627\u062f\u06af\u06cc \u06a9\u0627\u0631 \u0645\u06cc \u06a9\u0646\u062f.  \u06cc\u06a9 \u0645\u0648\u0631\u062f \u062c\u0627\u0644\u0628 \u062a\u0631 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f.<\/p>\n<p>\u062a\u063a\u06cc\u06cc\u0631 <code>another_file.txt<\/code> \u062f\u0648\u0628\u0627\u0631\u0647 \u0628\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u062f\u0631 \u0627\u0628\u062a\u062f\u0627:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594241_986_image-209.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-209\" width=\"487\" height=\"233\" loading=\"lazy\" title=\"\"><figcaption>\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u06cc\u06a9 \u062e\u0637 \u062c\u062f\u06cc\u062f \u062f\u0631 \u0627\u0628\u062a\u062f\u0627\u06cc <code>another_file.txt<\/code> (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p>\u062f\u0631 \u0646\u062a\u06cc\u062c\u0647\u060c \u0634\u0645\u0627\u0631\u0647 \u062e\u0637\u0648\u0637 \u0628\u0627 \u0646\u0633\u062e\u0647 \u0627\u0635\u0644\u06cc \u06a9\u0647 \u062f\u0631 \u0622\u0646 \u067e\u0686 \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u0627\u0633\u062a\u060c \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0633\u062a.  \u0648\u0635\u0644\u0647 \u0627\u06cc \u06a9\u0647 \u0642\u0628\u0644\u0627 \u0627\u06cc\u062c\u0627\u062f \u06a9\u0631\u062f\u0647 \u0627\u06cc\u062f \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594242_301_image-210.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-210\" width=\"509\" height=\"327\" loading=\"lazy\" title=\"\"><figcaption><code>new_patch.patch<\/code>  (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0641\u0631\u0636 \u0645\u06cc \u06a9\u0646\u062f \u06a9\u0647 \u062e\u0637 <code>So this is a file<\/code> \u0627\u0648\u0644\u06cc\u0646 \u062e\u0637 \u062f\u0631 \u0627\u0633\u062a <code>another_file.txt<\/code>\u060c \u06a9\u0647 \u062f\u06cc\u06af\u0631 \u0627\u06cc\u0646\u0637\u0648\u0631 \u0646\u06cc\u0633\u062a.  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 &#8230; \u062e\u0648\u0627\u0647\u062f \u0634\u062f <code>git apply<\/code> \u06a9\u0627\u0631\u061f<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594243_967_image-211.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-211\" width=\"569\" height=\"72\" loading=\"lazy\" title=\"\"><figcaption><code>git apply<\/code>  \u067e\u0686 \u0631\u0627 \u0627\u0639\u0645\u0627\u0644 \u0646\u0645\u06cc \u06a9\u0646\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u062e\u0628 \u0646\u0647.  \u067e\u0686 \u0627\u0639\u0645\u0627\u0644 \u0646\u0645\u06cc \u0634\u0648\u062f.  \u0627\u0645\u0627 \u0686\u0631\u0627\u061f  \u0622\u06cc\u0627 \u0648\u0627\u0642\u0639\u0627\u064b \u0628\u0647 \u062f\u0644\u06cc\u0644 \u062a\u063a\u06cc\u06cc\u0631 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637\u0648\u0637 \u0627\u0633\u062a\u061f<\/p>\n<p>\u0628\u0631\u0627\u06cc \u062f\u0631\u06a9 \u0628\u0647\u062a\u0631 \u0641\u0631\u0622\u06cc\u0646\u062f\u06cc \u06a9\u0647 Git \u0627\u0646\u062c\u0627\u0645 \u0645\u06cc \u062f\u0647\u062f\u060c \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0622\u0646 \u0631\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u06cc\u062f <code>--verbose<\/code> \u067e\u0631\u0686\u0645 \u0628\u0647 <code>git apply<\/code>\u060c \u0645\u0627\u0646\u0646\u062f:<\/p>\n<p><code>git apply --verbose new_patch.patch<\/code><\/p>\n<p><!--kg-card-end: markdown--><\/p>\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-213.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-213\" width=\"666\" height=\"444\" loading=\"lazy\" title=\"\"><figcaption><code>git apply --verbose<\/code>  \u0631\u0648\u0646\u062f\u06cc \u0631\u0627 \u06a9\u0647 Git \u0628\u0631\u0627\u06cc \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0637\u06cc \u0645\u06cc \u06a9\u0646\u062f \u0646\u0634\u0627\u0646 \u0645\u06cc \u062f\u0647\u062f (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u06a9\u0647 Git \u062a\u0645\u0627\u0645 \u0645\u062d\u062a\u0648\u06cc\u0627\u062a \u0641\u0627\u06cc\u0644\u060c \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635\u060c \u0627\u0632 \u062c\u0645\u0644\u0647 \u062e\u0637 \u0631\u0627 \u062c\u0633\u062a\u062c\u0648 \u06a9\u0631\u062f\u0647 \u0627\u0633\u062a <code>So we are writing an example<\/code>\u060c \u06a9\u0647 \u062f\u06cc\u06af\u0631 \u062f\u0631 \u0641\u0627\u06cc\u0644 \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f.  \u0627\u0632 \u0622\u0646\u062c\u0627\u06cc\u06cc \u06a9\u0647 Git \u0646\u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0627\u06cc\u0646 \u062e\u0637 \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u062f\u060c \u0646\u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u067e\u0686 \u0631\u0627 \u0627\u0639\u0645\u0627\u0644 \u06a9\u0646\u062f.<\/p>\n<p>\u0686\u0631\u0627 Git \u06a9\u0644 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u062c\u0633\u062a\u062c\u0648 \u0645\u06cc \u06a9\u0646\u062f\u061f  \u0628\u0647 \u0637\u0648\u0631 \u067e\u06cc\u0634 \u0641\u0631\u0636\u060c Git \u0628\u0647 \u062f\u0646\u0628\u0627\u0644 \u0622\u0646 \u0627\u0633\u062a <code>3<\/code> \u062e\u0637\u0648\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0642\u0628\u0644 \u0648 \u0628\u0639\u062f \u0627\u0632 \u0647\u0631 \u062a\u063a\u06cc\u06cc\u0631 \u0645\u0639\u0631\u0641\u06cc \u0634\u062f\u0647 \u062f\u0631 \u067e\u0686.  \u0627\u06af\u0631 \u0633\u0647 \u062e\u0637 \u0642\u0628\u0644 \u0648 \u0628\u0639\u062f \u0627\u0632 \u062e\u0637 \u0627\u0636\u0627\u0641\u0647 \u0634\u062f\u0647\u060c \u0648 \u0633\u0647 \u062e\u0637 \u0642\u0628\u0644 \u0648 \u0628\u0639\u062f \u0627\u0632 \u062e\u0637 \u062d\u0630\u0641 \u0634\u062f\u0647 (\u062f\u0631 \u0648\u0627\u0642\u0639 \u0641\u0642\u0637 \u06cc\u06a9 \u062e\u0637 \u0628\u0639\u062f \u0627\u0632 \u0622\u0646\u060c \u0632\u06cc\u0631\u0627 \u0647\u06cc\u0686 \u062e\u0637 \u062f\u06cc\u06af\u0631\u06cc \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f) \u0628\u06af\u06cc\u0631\u06cc\u062f &#8211; \u0628\u0647 \u06a9\u0644 \u0641\u0627\u06cc\u0644 \u062e\u0648\u0627\u0647\u06cc\u062f \u0631\u0633\u06cc\u062f.<\/p>\n<p>\u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 <code>-C<\/code> \u0628\u062d\u062b \u0648 \u062c\u062f\u0644.  \u0628\u0631\u0627\u06cc \u0645\u062b\u0627\u0644\u060c \u0627\u0632 Git \u0628\u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0647 \u062c\u0633\u062a\u062c\u0648 \u06a9\u0646\u062f <code>1<\/code> \u062e\u0637 \u0632\u0645\u06cc\u0646\u0647 \u0627\u0637\u0631\u0627\u0641\u060c \u062f\u0633\u062a\u0648\u0631 \u0632\u06cc\u0631 \u0631\u0627 \u0627\u062c\u0631\u0627 \u06a9\u0646\u06cc\u062f:<\/p>\n<p><code>git apply -C1 new_patch.patch<\/code><\/p>\n<p>\u067e\u0686 \u062a\u0645\u06cc\u0632 \u0627\u0639\u0645\u0627\u0644 \u0645\u06cc \u0634\u0648\u062f!  \ud83c\udf89<\/p>\n<p>\u0686\u0631\u0627 \u0627\u06cc\u0646\u0637\u0648\u0631 \u0627\u0633\u062a\u061f  \u062f\u0648\u0628\u0627\u0631\u0647 \u067e\u0686 \u0631\u0627 \u062f\u0631 \u0646\u0638\u0631 \u0628\u06af\u06cc\u0631\u06cc\u062f:<\/p>\n<p><!--kg-card-end: markdown--><\/p>\n<figure class=\"kg-card kg-image-card kg-card-hascaption\"><img decoding=\"async\" src=\"https:\/\/rasanegar.com\/blog\/wp-content\/uploads\/2023\/12\/1703594242_301_image-210.png\" class=\"kg-image\" alt=\"\u062a\u0635\u0648\u06cc\u0631-210\" width=\"509\" height=\"327\" loading=\"lazy\" title=\"\"><figcaption><code>new_patch.patch<\/code>  (\u0645\u0646\u0628\u0639: \u0645\u062e\u062a\u0635\u0631)<\/figcaption><\/figure>\n<p><!--kg-card-begin: markdown--><\/p>\n<p>\u0647\u0646\u06af\u0627\u0645 \u0627\u0639\u0645\u0627\u0644 \u067e\u0686 \u0628\u0627 <code>-C1<\/code> \u06af\u0632\u06cc\u0646\u0647\u060c Git \u0628\u0647 \u062f\u0646\u0628\u0627\u0644 \u062e\u0637\u0648\u0637 \u0627\u0633\u062a:<\/p>\n<pre><code class=\"language-text\">It has some really nice lines\nLike this one\n<\/code><\/pre>\n<p>\u0628\u0647 \u0645\u0646\u0638\u0648\u0631 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062e\u0637 <code>!!!This is the new line I am adding!!!<\/code> \u0628\u06cc\u0646 \u0627\u06cc\u0646 \u062f\u0648 \u062e\u0637  \u0627\u06cc\u0646 \u062e\u0637\u0648\u0637 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u0646\u062f (\u0648 \u0645\u0647\u0645\u062a\u0631 \u0627\u0632 \u0647\u0645\u0647\u060c \u0622\u0646\u0647\u0627 \u06cc\u06a9\u06cc \u067e\u0633 \u0627\u0632 \u062f\u06cc\u06af\u0631\u06cc \u0638\u0627\u0647\u0631 \u0645\u06cc \u0634\u0648\u0646\u062f).  \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 Git \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0628\u0627 \u0645\u0648\u0641\u0642\u06cc\u062a \u062e\u0637 \u0628\u06cc\u0646 \u0622\u0646\u0647\u0627 \u0631\u0627 \u0627\u0636\u0627\u0641\u0647 \u06a9\u0646\u062f\u060c \u062d\u062a\u06cc \u0627\u06af\u0631 \u0634\u0645\u0627\u0631\u0647 \u062e\u0637\u0648\u0637 \u062a\u063a\u06cc\u06cc\u0631 \u06a9\u0631\u062f\u0647 \u0628\u0627\u0634\u062f.<\/p>\n<p>\u0628\u0647 \u0637\u0648\u0631 \u0645\u0634\u0627\u0628\u0647\u060c Git \u0628\u0647 \u062f\u0646\u0628\u0627\u0644 \u062e\u0637\u0648\u0637 \u062e\u0648\u0627\u0647\u062f \u0628\u0648\u062f:<\/p>\n<pre><code class=\"language-text\">And we are now learning about Git\nSo we are writing an example\nGit is lovely!\n<\/code><\/pre>\n<p>\u0647\u0645\u0627\u0646\u0637\u0648\u0631 \u06a9\u0647 Git \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0627\u06cc\u0646 \u062e\u0637\u0648\u0637 \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u062f\u060c Git \u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u062e\u0637 \u0648\u0633\u0637 \u0631\u0627 \u067e\u0627\u06a9 \u06a9\u0646\u062f.<\/p>\n<p>\u0627\u06af\u0631 \u06cc\u06a9\u06cc \u0627\u0632 \u0627\u06cc\u0646 \u062e\u0637\u0648\u0637 \u0631\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u062f\u0627\u062f\u06cc\u0645\u060c \u0645\u062b\u0644\u0627\u064b \u062a\u063a\u06cc\u06cc\u0631 \u06a9\u0631\u062f <code>And we are now learning about Git<\/code> \u0628\u0647 <code>And we are now learning about patches in Git<\/code>\u060c \u0633\u067e\u0633 Git \u0646\u0645\u06cc \u062a\u0648\u0627\u0646\u062f \u0631\u0634\u062a\u0647 \u0628\u0627\u0644\u0627 \u0631\u0627 \u067e\u06cc\u062f\u0627 \u06a9\u0646\u062f \u0648 \u0628\u0646\u0627\u0628\u0631\u0627\u06cc\u0646 \u067e\u0686 \u0627\u0639\u0645\u0627\u0644 \u0646\u0645\u06cc \u0634\u0648\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/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><!--kg-card-begin: markdown--><\/p>\n<p>\u062f\u0631 \u0627\u06cc\u0646 \u067e\u0633\u062a \u06cc\u0627\u062f \u06af\u0631\u0641\u062a\u06cc\u062f \u06a9\u0647 \u062a\u0641\u0627\u0648\u062a \u0686\u06cc\u0633\u062a \u0648 \u062a\u0641\u0627\u0648\u062a \u0628\u06cc\u0646 diff \u0648 patch \u0686\u06cc\u0633\u062a.  \u0634\u0645\u0627 \u06cc\u0627\u062f \u06af\u0631\u0641\u062a\u06cc\u062f \u06a9\u0647 \u0686\u06af\u0648\u0646\u0647 \u0648\u0635\u0644\u0647 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0631\u0627 \u0628\u0627 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0633\u0648\u0626\u06cc\u0686 \u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641 \u0628\u0631\u0627\u06cc \u0627\u06cc\u062c\u0627\u062f \u06a9\u0646\u06cc\u062f <code>git diff<\/code>.<\/p>\n<p>\u0634\u0645\u0627 \u0647\u0645\u0686\u0646\u06cc\u0646 \u06cc\u0627\u062f \u06af\u0631\u0641\u062a\u06cc\u062f \u06a9\u0647 \u062e\u0631\u0648\u062c\u06cc \u0686\u06cc\u0633\u062a <code>git diff<\/code> \u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0648 \u0686\u06af\u0648\u0646\u0647 \u0633\u0627\u062e\u062a\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a.  \u062f\u0631 \u0646\u0647\u0627\u06cc\u062a\u060c \u0646\u062d\u0648\u0647 \u0627\u0639\u0645\u0627\u0644 \u0648\u0635\u0644\u0647 \u0647\u0627 \u0648 \u0628\u0647 \u0637\u0648\u0631 \u062e\u0627\u0635 \u0627\u0647\u0645\u06cc\u062a \u0632\u0645\u06cc\u0646\u0647 \u0631\u0627 \u06cc\u0627\u062f \u06af\u0631\u0641\u062a\u06cc\u062f.<\/p>\n<p>\u062f\u0631\u06a9 \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u06cc\u06a9 \u0646\u0642\u0637\u0647 \u0639\u0637\u0641 \u0627\u0635\u0644\u06cc \u0628\u0631\u0627\u06cc \u062f\u0631\u06a9 \u0628\u0633\u06cc\u0627\u0631\u06cc \u0627\u0632 \u0641\u0631\u0622\u06cc\u0646\u062f\u0647\u0627\u06cc \u062f\u06cc\u06af\u0631 \u062f\u0631 Git \u0627\u0633\u062a &#8211; \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u062b\u0627\u0644\u060c \u0627\u062f\u063a\u0627\u0645 \u06cc\u0627 \u062a\u063a\u06cc\u06cc\u0631 \u067e\u0627\u06cc\u0647.<\/p>\n<p>\u062f\u0631 \u0622\u0645\u0648\u0632\u0634 \u0647\u0627\u06cc \u0622\u06cc\u0646\u062f\u0647\u060c \u0627\u0632 \u062f\u0627\u0646\u0634 \u062e\u0648\u062f \u062f\u0631 \u0627\u06cc\u0646 \u067e\u0633\u062a \u0628\u0631\u0627\u06cc \u0634\u06cc\u0631\u062c\u0647 \u0632\u062f\u0646 \u0628\u0647 \u0633\u0627\u06cc\u0631 \u062d\u0648\u0632\u0647 \u0647\u0627\u06cc Git \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u062e\u0648\u0627\u0647\u06cc\u062f \u06a9\u0631\u062f.<\/p>\n<p><!--kg-card-end: markdown--><\/p>\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>\u062f\u0631\u0628\u0627\u0631\u0647 \u0646\u0648\u06cc\u0633\u0646\u062f\u0647<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<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 YouTube Git Internals \u2014 \u062a\u0648\u0633\u0637 Brief.<\/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<\/ul>\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 16:06:03<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;9723&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;Git Diff and Patch \u2013 \u0631\u0627\u0647\u0646\u0645\u0627\u06cc \u06a9\u0627\u0645\u0644 \u0628\u0631\u0627\u06cc \u062a\u0648\u0633\u0639\u0647 \u062f\u0647\u0646\u062f\u06af\u0627\u0646&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\"> 15<\/span> <span class=\"rt-label rt-postfix\">\u062f\u0642\u06cc\u0642\u0647<\/span><\/span>\u0628\u0633\u06cc\u0627\u0631\u06cc \u0627\u0632 \u0641\u0631\u0622\u06cc\u0646\u062f\u0647\u0627\u06cc \u062c\u0627\u0644\u0628 \u062f\u0631 Git \u0645\u0627\u0646\u0646\u062f \u0627\u062f\u063a\u0627\u0645\u060c rebasing \u06cc\u0627 \u062d\u062a\u06cc committing \u0628\u0631 \u0627\u0633\u0627\u0633 \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u0648 \u0648\u0635\u0644\u0647 \u0647\u0627 \u0647\u0633\u062a\u0646\u062f. \u062a\u0648\u0633\u0639\u0647\u200c\u062f\u0647\u0646\u062f\u06af\u0627\u0646 \u0647\u0645\u06cc\u0634\u0647 \u0628\u0627 \u062a\u0641\u0627\u0648\u062a\u200c\u0647\u0627 \u06a9\u0627\u0631 \u0645\u06cc\u200c\u06a9\u0646\u0646\u062f\u060c \u0686\u0647 \u0645\u0633\u062a\u0642\u06cc\u0645\u0627\u064b \u0627\u0632 Git \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f \u0648 \u0686\u0647 \u0628\u0627 \u062a\u06a9\u06cc\u0647 \u0628\u0631 \u0646\u0645\u0627\u06cc \u062a\u0641\u0627\u0648\u062a IDE. \u062f\u0631 \u0627\u06cc\u0646 \u067e\u0633\u062a\u060c \u062a\u0641\u0627\u0648\u062a \u0647\u0627 \u0648 \u067e\u0686 \u0647\u0627\u06cc Git \u0686\u06cc\u0633\u062a\u060c \u0633\u0627\u062e\u062a\u0627\u0631 \u0622\u0646\u0647\u0627 \u0648 \u0646\u062d\u0648\u0647 \u0627\u0639\u0645\u0627\u0644 [&hellip;]<\/p>\n","protected":false},"author":6,"featured_media":9724,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1726,620,206],"tags":[2440,498,1943,281,1949,1948,1814,1881,1882,1759,1942,2441,1940,2079],"class_list":["post-9723","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-devops","category-programming","category-development","tag-diff","tag-git","tag-git-vps","tag-patch","tag-1949","tag-1948","tag-1814","tag-1881","tag-1882","tag-1759","tag---gitlab","tag-2441","tag-1940","tag-2079"],"acf":[],"_links":{"self":[{"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/posts\/9723","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=9723"}],"version-history":[{"count":0,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/posts\/9723\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/media\/9724"}],"wp:attachment":[{"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/media?parent=9723"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/categories?post=9723"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/rasanegaar.com\/blog\/wp-json\/wp\/v2\/tags?post=9723"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}