Differences

This shows you the differences between two versions of the page.

--- git [2022/04/01 15:04] – dblume
+++ git [2022/04/25 11:43] – dblume
@@ Line 58: / Line 58: @@
 <code>
-git push -u origin master
+git push -u origin main
 </code>
@@ Line 77: / Line 77: @@
 git commit -m "first commit"
 git remote add origin https://github.com/dblume/hexbright-factory.git
-git push -u origin master
+git push -u origin main
-</code>
-===== Creating a new remote repository from an existing local one =====
-I created wine-tasting at [[https://github.com/new]].  Then, to create a new repository on the command line at the local computer:
-<code>
-~$ mkdir wine-tasting
-~$ cd wine-tasting/
-wine-tasting$ vim README.md
-wine-tasting$ vim LICENSE.txt
-wine-tasting$ git init
-wine-tasting$ git add README.md
-wine-tasting$ git add LICENSE.txt
-wine-tasting$ git add test.py
-wine-tasting$ git add wine_allocator.py
-wine-tasting$ git commit -m "first commit"
-wine-tasting$ git remote add origin https://github.com/dblume/wine-tasting.git
-wine-tasting$ git push -u origin master
 </code>
@@ Line 156: / Line 137: @@
 <code bash>
 git checkout -b bugfix/JIRA-1-new-bugfix
-(fix bugs)
+# If main is getting updated, rebase like so:
+#   git checkout main
+#   git pull
+#   git checkout bugfix/JIRA-1-new-bugfix
+#   git rebase main
+# Consider whether you want to squash commits before pushing
+#   git reset --soft HEAD~3
 git commit -m "fixed bug"
 git push --set-upstream origin bugfix/JIRA-1-new-bugfix
@@ Line 186: / Line 176: @@
 ...
 testcode$ git remote add origin ssh://USERNAME@dlma.com/~/git/testcode.git
-testcode$ git push origin master
+testcode$ git push origin main
 </code>
 I could've used gitweb but I used GitHub-like [[https://github.com/klaussilveira/gitlist|gitlist]] at http://git.dlma.com.