{"id":1469,"date":"2010-12-08T01:32:37","date_gmt":"2010-12-08T06:32:37","guid":{"rendered":"http:\/\/crazedmonkey.com\/blog\/links\/thou-shalt-not-lie-git-rebase-ammend-squash-and-other-lies-paul-stadig.html"},"modified":"2011-11-07T12:33:54","modified_gmt":"2011-11-07T17:33:54","slug":"thou-shalt-not-lie-git-rebase-ammend-squash-and-other-lies-paul-stadig","status":"publish","type":"post","link":"http:\/\/crazedmonkey.com\/blog\/links\/thou-shalt-not-lie-git-rebase-ammend-squash-and-other-lies-paul-stadig.html","title":{"rendered":"Thou Shalt Not Lie: git rebase, amend, squash, and other lies (Paul Stadig)"},"content":{"rendered":"<p>We use SVN at work. I use git-svn to manage my commits and give me faster local access to changes. I suppose I may be guilty of some of the lies Paul Stadig speaks of in his article.<\/p>\n<p>I use git add -p to cherry pick changes, git stash to set aside incomplete changes, and git amend to commit changes I missed before pushing up to master.<\/p>\n<p>I absolutely love git add -p. It allows me to work on a series of changes without interrupting my flow to make a commit. I may work for an hour or so, and group my changes into logical commits containing specific tasks. I take care to make sure I don&#8217;t break code between commits, but that&#8217;s bound to bite me in the ass sooner or later.<\/p>\n<p>I often use git amend to fix my last commit message and sometimes to include a missed change. I rarely use git rebase &#8211;interactive, and only to include changes I missed in a recent local commit.<\/p>\n<p>Looks like it may be time to rethink my practices.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>We use SVN at work. I use git-svn to manage my commits and give me faster local access to changes. I suppose I may be guilty of some of the lies Paul Stadig speaks of in his article.<\/p>\n<p>I use git add -p to cherry pick changes, git stash to set aside incomplete changes, and&nbsp;&hellip;&nbsp;<a class=\"read_more\" href=\"http:\/\/crazedmonkey.com\/blog\/links\/thou-shalt-not-lie-git-rebase-ammend-squash-and-other-lies-paul-stadig.html\" rel=\"bookmark\" title=\"Continue reading &ldquo;Thou Shalt Not Lie: git rebase, amend, squash, and other lies (Paul Stadig)&rdquo;\"><span>Read more<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_mi_skip_tracking":false},"categories":[36,33],"tags":[],"_links":{"self":[{"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/posts\/1469"}],"collection":[{"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/comments?post=1469"}],"version-history":[{"count":3,"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/posts\/1469\/revisions"}],"predecessor-version":[{"id":1834,"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/posts\/1469\/revisions\/1834"}],"wp:attachment":[{"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/media?parent=1469"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/categories?post=1469"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/crazedmonkey.com\/blog\/wp-json\/wp\/v2\/tags?post=1469"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}