{"id":1124,"date":"2023-12-24T12:11:47","date_gmt":"2023-12-24T11:11:47","guid":{"rendered":"https:\/\/r-raimann.de\/WordPress\/?p=1124"},"modified":"2024-06-05T16:39:06","modified_gmt":"2024-06-05T15:39:06","slug":"branching-with-git","status":"publish","type":"post","link":"https:\/\/r-raimann.de\/WordPress\/branching-with-git\/","title":{"rendered":"Branching with Git"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">Here some code \/ command snippets to manage a code repository in Git.<br>No matter if it&#8217;s hosted on GitHub, GitLab or BitBucket<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Setup Git<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code><code>git config<br>--global user.name &lt;git-user&gt;<br>--global user.email &lt;email&gt;<\/code><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Local repository<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code><code>git init &lt;repo-name&gt;<\/code><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Server Repository: Gui -&gt; create Repository -&gt; note URL<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git remote add origin &lt;url>\ngit push origin +main<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Staging<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git add .\ngit add &lt;file-name&gt;\n<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Check Status<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git status\ngit log\ngit log --oneline<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Undo commit<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git revert &lt;id&gt;\ngit revert HEAD~n\ngit reset --hard HEAD~n   --&gt; \"rm -rf\"\ngit reset --soft HEAD~n   --&gt; back to staging<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Checkout and compare<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git diff &lt;file&gt;<br>git checkout &lt;file&gt;<br>git checkout &lt;branch&gt;<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Rename &#8220;master&#8221; to &#8220;main&#8221;<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git branch -M main\ngit push -u origin main\ngit push origin --delete master<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">create new branch<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout &lt;source-branch&gt;\ngit chechout -b &lt;dest-branch&gt;\ngit push -u origin &lt;dest-branch&gt;<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">Merge  Branch (source into destination)<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout &lt;destination-branch&gt;\ngit merge &lt;input-branch&gt;<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>Here some code \/ command snippets to manage a code repository in Git.No matter if it&#8217;s hosted on GitHub, GitLab<\/p>\n","protected":false},"author":1,"featured_media":1125,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"colormag_page_container_layout":"default_layout","colormag_page_sidebar_layout":"default_layout","footnotes":""},"categories":[37,234],"tags":[238,239,221,236,237,235],"class_list":["post-1124","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-latest","category-web-pm","tag-bitbucket","tag-branching","tag-git","tag-github","tag-gitlab","tag-repository"],"_links":{"self":[{"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/posts\/1124","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/comments?post=1124"}],"version-history":[{"count":6,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/posts\/1124\/revisions"}],"predecessor-version":[{"id":1208,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/posts\/1124\/revisions\/1208"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/media\/1125"}],"wp:attachment":[{"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/media?parent=1124"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/categories?post=1124"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/r-raimann.de\/WordPress\/wp-json\/wp\/v2\/tags?post=1124"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}