Differences

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

--- git [2026/07/13 00:15] – [Fork] jhagstrand
+++ git [2026/08/06 07:54] (current) – [repository] jhagstrand
@@ Line 52: / Line 52: @@
 === bare===
 a bare repository is a folder named project.git\\
-a non-bare repository is a subfolder named .git, co-residing in the project folder along with the working copy\\
+a non-bare repository is a sub-folder named .git, co-residing in the project folder along with the working copy\\
-  git init
+  git init  # executed from within a new project folder, creates the .git folder
-  git clone
+  git init --bare flash.git  # create a new sub-folder named flash.git
+  git clone <server.path>.flash.git # create sub-folder named flash, within which lies the .git sub-folder
 ====remote====
@@ Line 403: / Line 405: @@
 . git merge     # apply patches to local files
 +2. git pull    # fetch and merge
+====Fork====
+In github ui, fork repo from voyc to hagstrand.  A fork is a server-side clone.
+Locally:
+	git clone xttps://github.com/hagstrand/flash flashbang   # specified target <directory>
+	git remote add upstream xttps:github.com/voyc/flash   # second remote
+	git pull --rebase upstream master   # pull changes from upstream, update local, no commit
+	# pull does a fetch and merge into local directory.  No need to commit.
+	git push origin master
+	Todo: Rename?
+	Todo: In github UI, “Pull Request” to bring forked project back into upstream.
 ===== How to use =====