{"id":155391,"date":"2012-10-19T15:35:03","date_gmt":"2012-10-19T11:35:03","guid":{"rendered":"http:\/\/savepearlharbor.com\/?p=155391"},"modified":"-0001-11-30T00:00:00","modified_gmt":"-0001-11-29T21:00:00","slug":"","status":"publish","type":"post","link":"https:\/\/savepearlharbor.com\/?p=155391","title":{"rendered":"<span class=\"post_title\">git up \u0438 \u0432\u0441\u0435 \u0432\u0441\u0435 \u0432\u0441\u0435<\/span>"},"content":{"rendered":"<div class=\"content html_format\">   \t\u041a\u043e\u043c\u043c\u0430\u043d\u0434\u0430 git up (\u0430\u043d\u0430\u043b\u043e\u0433 svn up) \u0434\u043e\u0431\u0430\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0442\u0430\u043a:  <\/p>\n<pre><code class=\"bash\">git config --global alias.up '!(git add . && git stash && git pull --rebase &gt;&2) | grep -v &quot;No local changes to save&quot; && git stash pop' <\/code><\/pre>\n<p>  git up \u043f\u0440\u0438 \u043d\u0430\u0434\u043e\u0431\u043d\u043e\u0441\u0442\u0438 \u043d\u044b\u043a\u0430\u0435\u0442 \u0432\u0441\u0435 \u0435\u0449\u0451 \u043d\u0435\u0437\u0430\u043a\u043e\u043c\u043c\u0438\u0447\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432 stash, \u043e\u0431\u043d\u043e\u0432\u043b\u044f\u0435\u0442 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u0443\u044e \u0432\u0435\u0442\u043a\u0443 \u0434\u043e \u0441\u0432\u0435\u0436\u0430\u0439\u0448\u0435\u0439 \u0438 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0435\u0442 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043d\u0430\u0437\u0430\u0434. \u0412 \u0442\u043e\u043c \u0447\u0438\u0441\u043b\u0435 \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0438\u0442 \u0435\u0449\u0451 \u043d\u0435\u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u043a\u043e\u043c\u043c\u0438\u0442\u044b \u0432 \u0441\u0430\u043c\u044b\u0439 \u043a\u043e\u043d\u0435\u0446 \u0434\u0435\u043b\u0430\u044f \u0438\u0441\u0442\u043e\u0440\u0438\u044e \u043b\u0438\u043d\u0435\u0439\u043d\u043e\u0439 \u043a\u0430\u043a \u0432 Subversion, \u0442.\u0435. \u0438\u0437\u0431\u0435\u0433\u0430\u044f \u0432\u0435\u0442\u043e\u043a \u0438 \u043b\u0438\u0448\u043d\u0438\u0445 merge-\u043a\u043e\u043c\u043c\u0438\u0442\u043e\u0432.<br \/>  <a name=\"habracut\"><\/a><br \/>  \u0415\u0441\u043b\u0438 \u0432\u0441\u0451 \u043f\u0440\u043e\u0448\u043b\u043e \u0433\u043b\u0430\u0434\u043a\u043e (\u0431\u0435\u0437 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432) \u043c\u043e\u0436\u043d\u043e \u0441\u0440\u0430\u0437\u0443 \u0436\u0435 \u0434\u0435\u043b\u0430\u0442\u044c git push. \u0412 \u0440\u0435\u0434\u043a\u0438\u0445 \u0441\u043b\u0443\u0447\u0430\u044f\u0445 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432 (\u0432\u044b \u0438 \u043a\u0442\u043e-\u0442\u043e \u043c\u0435\u043d\u044f\u043b\u0438 \u043e\u0434\u043d\u0443 \u0438 \u0442\u0443 \u0436\u0435 \u0441\u0442\u0440\u043e\u043a\u0443) rebase \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0441\u044f \u0438 \u0434\u0430\u043b\u0435\u0435 \u043a\u043e\u043d\u0435\u0447\u043d\u043e \u043f\u0440\u0438\u0434\u0435\u0442\u0441\u044f \u0440\u0430\u0437\u0431\u0438\u0440\u0430\u0442\u044c\u0441\u044f \u0441\u0430\u043c\u043e\u043c\u0443 \u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0442\u044c \u0430\u043f\u0434\u0435\u0439\u0442 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e git rebase &#8212;continue \u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043d\u0443\u0436\u043d\u043e \u0440\u0430\u0437 \u0438 git stash apply \u0447\u0442\u043e\u0431\u044b \u0432\u0435\u0440\u043d\u0443\u0442\u044c \u0437\u0430\u043d\u044b\u043a\u0430\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f.<\/p>\n<p>  \u0415\u0441\u0442\u044c \u043c\u043d\u043e\u0433\u043e \u0430\u043d\u0430\u043b\u043e\u0433\u043e\u0432, \u043d\u043e \u0432 \u0431\u043e\u043b\u044c\u0448\u0438\u043d\u0441\u0442\u0432\u0435 \u0441\u0432\u043e\u0435\u043c \u044d\u0442\u043e \u043d\u0435\u043b\u0430\u043a\u043e\u043d\u0438\u0447\u043d\u044b\u0435 \u0441\u043a\u0440\u0438\u043f\u0442\u044b. \u0410\u043b\u0438\u0430\u0441 \u043b\u0435\u0433\u043a\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u0430 \u043b\u044e\u0431\u043e\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u0432\u043c\u0435\u0441\u0442\u0435 \u0441 \u0434\u0440\u0443\u0433\u0438\u043c\u0438 \u043f\u0440\u043e\u0441\u0442\u043e \u0432\u0441\u0442\u0430\u0432\u0438\u0432 \u0432 \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0432\u0441\u0451 \u044d\u0442\u043e:<\/p>\n<pre><code class=\"bash\"># git up git config --global alias.up '!(git add . && git stash && git pull --rebase &gt;&2) | grep -v &quot;No local changes to save&quot; && git stash pop'  # git in \/ git out \u2014 \u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u043a\u0430\u043a\u0438\u0435 \u043a\u043e\u043c\u043c\u0438\u0442\u044b \u043f\u0440\u0438\u0434\u0443\u0442\/\u0443\u0439\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435\u043c pull\/push git config --global alias.in '!git remote update -p; git log ..@{u}' git config --global alias.out 'log @{u}..'  # git addremove - \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0438\u043d\u0434\u0435\u043a\u0441 \u043d\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b\/\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0438 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0441\u0451 \u0447\u0442\u043e \u0443\u0434\u0430\u043b\u0438\u043b\u043e\u0441\u044c git config --global alias.addremove \\!&quot;git add . && git ls-files --deleted | xargs --no-run-if-empty git rm&quot;  # git unstage - \u0443\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0451 \u0438\u0437 \u0438\u043d\u0434\u0435\u043a\u0441\u0430 (\u0447\u0442\u043e\u0431\u044b \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c\/\u0437\u0430\u043a\u043e\u043c\u043c\u0438\u0442\u0438\u0442\u044c \u0441\u043d\u0430\u0447\u0430\u043b\u0430 \u0447\u0442\u043e-\u0442\u043e \u0434\u0440\u0443\u0433\u043e\u0435) git config --global alias.unstage &quot;reset HEAD --&quot;  # git backup - \u0437\u0430\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0441\u044c \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0439 \u043f\u0435\u0440\u0435\u0434 \u044d\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u043c git config --global alias.backup \\!'file=..\/`git describe`.tar && echo &quot;Creating `readlink -f $file`&quot; && tar cf $file .'  # \u041f\u0440\u043e\u0441\u0442\u043e \u0443\u0434\u043e\u0431\u043d\u044b\u0435 \u0441\u043e\u043a\u0440\u0430\u0449\u0435\u043d\u0438\u044f git config --global alias.st &quot;status -sb&quot; git config --global alias.ci commit git config --global alias.co checkout git config --global alias.br branch git config --global alias.bra &quot;branch -a&quot; git config --global alias.chp cherry-pick git config --global alias.pr &quot;pull --rebase&quot; git config --global alias.bl &quot;blame -b -w&quot; git config --global alias.cia &quot;commit --amend&quot; git config --global alias.lg &quot;log --pretty=format:'%h was %an, %ar, message: %s' --graph&quot; git config --global alias.who &quot;shortlog -s --&quot;  # what else? <\/code><\/pre>\n<p>  \u0414\u0435\u043b\u0438\u0442\u0435\u0441\u044c \u043f\u043e\u043b\u0435\u0437\u043d\u044b\u043c\u0438 \u0430\u043b\u0438\u0430\u0441\u0430\u043c\u0438!    \t   \t<\/p>\n<div class=\"clear\"><\/div>\n<\/p><\/div>\n<p> \u0441\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043e\u0440\u0438\u0433\u0438\u043d\u0430\u043b \u0441\u0442\u0430\u0442\u044c\u0438 <a href=\"http:\/\/habrahabr.ru\/post\/155391\/\"> http:\/\/habrahabr.ru\/post\/155391\/<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<div class=\"content html_format\">   \t\u041a\u043e\u043c\u043c\u0430\u043d\u0434\u0430 git up (\u0430\u043d\u0430\u043b\u043e\u0433 svn up) \u0434\u043e\u0431\u0430\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0442\u0430\u043a:  <\/p>\n<pre><code class=\"bash\">git config --global alias.up '!(git add . &#038;& git stash &#038;& git pull --rebase &gt;&#038;2) | grep -v &quot;No local changes to save&quot; &#038;& git stash pop' <\/code><\/pre>\n<p>  git up \u043f\u0440\u0438 \u043d\u0430\u0434\u043e\u0431\u043d\u043e\u0441\u0442\u0438 \u043d\u044b\u043a\u0430\u0435\u0442 \u0432\u0441\u0435 \u0435\u0449\u0451 \u043d\u0435\u0437\u0430\u043a\u043e\u043c\u043c\u0438\u0447\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432 stash, \u043e\u0431\u043d\u043e\u0432\u043b\u044f\u0435\u0442 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u0443\u044e \u0432\u0435\u0442\u043a\u0443 \u0434\u043e \u0441\u0432\u0435\u0436\u0430\u0439\u0448\u0435\u0439 \u0438 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0435\u0442 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043d\u0430\u0437\u0430\u0434. \u0412 \u0442\u043e\u043c \u0447\u0438\u0441\u043b\u0435 \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0438\u0442 \u0435\u0449\u0451 \u043d\u0435\u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u043a\u043e\u043c\u043c\u0438\u0442\u044b \u0432 \u0441\u0430\u043c\u044b\u0439 \u043a\u043e\u043d\u0435\u0446 \u0434\u0435\u043b\u0430\u044f \u0438\u0441\u0442\u043e\u0440\u0438\u044e \u043b\u0438\u043d\u0435\u0439\u043d\u043e\u0439 \u043a\u0430\u043a \u0432 Subversion, \u0442.\u0435. \u0438\u0437\u0431\u0435\u0433\u0430\u044f \u0432\u0435\u0442\u043e\u043a \u0438 \u043b\u0438\u0448\u043d\u0438\u0445 merge-\u043a\u043e\u043c\u043c\u0438\u0442\u043e\u0432.  <\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[],"tags":[],"class_list":["post-155391","post","type-post","status-publish","format-standard","hentry"],"_links":{"self":[{"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=\/wp\/v2\/posts\/155391","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=155391"}],"version-history":[{"count":0,"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=\/wp\/v2\/posts\/155391\/revisions"}],"wp:attachment":[{"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=155391"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=155391"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/savepearlharbor.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=155391"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}