Differences

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

--- todo-git [2017/03/10 10:50] – [Renaming branches] dblume
+++ todo-git [2022/02/04 15:02] (current) – removed dblume
@@ Line 1: / Line 1: @@
-====== git ======
-Make the clone at the remote repository.
-<code>
-git clone git@github.com:dblume/get-shit-done
-</code>
-<code>
-git remote add upstream git://github.com/icambridge/get-shit-done
-</code>
-Enter a comment for the commit.  See section 2.7.2 [[http://cworth.org/hgbook-git/tour/|here]].
-<code>
-git commit -a
-</code>
-Double checking the alias names...
-<code>
-$ git remote -v
-origin  git@github.com:dblume/get-shit-done (fetch)
-origin  git@github.com:dblume/get-shit-done (push)
-upstream        git://github.com/icambridge/get-shit-done (fetch)
-upstream        git://github.com/icambridge/get-shit-done (push)
-</code>
-The push that worked from within the local directory:
-<code>
-git push origin
-</code>
-===== Make a local clone of an existing remote project =====
-From the parent directory:
-<code>
-git clone https://github.com/realpython/interview-questions.git python-interview
-cd python-interview
-</code>
-===== When it's time to commit =====
-**1.** Check which files are staged for commit.
-<code>
-git status
-</code>
-**2.** Then, when you're ready to commit locally,
-<code>
-git commit -a -m "Some useful comment"
-</code>
-**3.** When you're ready to push a local commit to a remote one...
-<code>
-git push -u origin master
-</code>
-or
-<code>
-git push https://github.com/dblume/netflix-dvd-feed
-</code>
-===== Creating a new remote repository from an existing local one =====
-I created hexbright-factory at [[https://github.com/new]].  Then, to create a new repository on the command line at the local computer:
-<code>
-touch README.md
-git init
-git add README.md
-git commit -m "first commit"
-git remote add origin https://github.com/dblume/hexbright-factory.git
-git push -u origin master
-</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>
-====== Renaming branches ======
-To rename a remote branch (where "origin" is the name of the remote repo):
-  - Rename the local one.
-  - Push the deletion of the old name.
-  - Push the new name.
-  - git remote prune origin
-When someone else renamed a remote branch:
-<code bash>
-$ git fetch --all  # TODO investigate why fetch
-$ git remote prune origin  # (where origin is the name of the shared repo)
-</code>
-Now I should see "remotes/origin/roku_dev" gone, and "remotes/origin/SDK_4.2.P2_Roku" appear.
-I still have a local branch called "roku_dev" and it's set to track  "remotes/origin/roku_dev".  Since "remotes/origin/roku_dev" is no longer there, if I try "git pull" on that branch it will say remote reference doesn't exist.
-Since I don't have any changes on that local branch that I haven't pushed up to the server before the name change, I can safely delete this local branch, and create a new local branch from "remotes/origin/SDK_4.2.P2_Roku".
-==== Changing a local branch without regard to remote branch ====
-<code>
-$ git checkout -b branch_name
-Switched to a new branch 'branch_name'
-</code>
-That was the same as "git branch branch_name; git checkout branch_name"
-==== Changing a local branch to a new remote branch ====
-This'll work if you don't have a local branch with that name already.
-<code>
-$ git checkout --track origin/branch_name
-</code>
-==== Making the current local branch track a new remote branch ====
-<code>
-$ git branch -u origin/branch_name
-</code>
-====== git at dlma.com ======
-I created a remote git repo at dlma like so:
-At the server:
-<code bash>
-git$ mkdir testcode.git
-git$ cd testcode.git/
-testcode.git$ git init --bare
-</code>
-Then, at the local computer:
-<code bash>
-testcode$ git init
-Initialized empty Git repository in /home/David/testcode/.git/
-testcode$ git add .
-testcode$ git commit -m "first commit"
-...
-testcode$ git remote add origin ssh://USERNAME@dlma.com/~/git/testcode.git
-testcode$ git push origin master
-</code>
-I could've use gitweb but I used GitHub-like [[https://github.com/klaussilveira/gitlist|gitlist]] at http://git.dlma.com.