Differences

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

--- git [2023/01/23 15:23] – dblume
+++ git [2024/06/12 11:29] (current) – dblume
@@ Line 1: / Line 1: @@
 ====== git ======
-Make the clone at the remote repository.
+Make the clone of the remote repository.
 <code>
@@ Line 10: / Line 10: @@
 git remote add upstream git://github.com/icambridge/get-shit-done
 </code>
+If it's a huge repo, [[https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/|consider blobless and single branch and no tags]], like so...
+<code>
+git clone \
+  --filter=blob:none \
+  -b main \
+  --single-branch \
+  --no-tags \
+  --shallow-submodules \
+  --recurse-submodules=os/components/toolchain \
+  --recurse-submodules=':(exclude)**/porting_kit:' \
+  git@fake.github.com:project/project.git
+</code>
+Eventually, if you want to add another branch to a single-branch clone:
+  git remote set-branches --add origin another-branch
+Or to de-single-branch-ize a clone:
+  git remote set-branches origin "*"
 ===== Creating a new remote repository from an existing local one =====
@@ Line 54: / Line 77: @@
   $ git push --set-upstream origin new_branch
+==== Creating a local branch from an existing remote ====
+After doing a fetch, and suppose "origin/remote-branch" exists, then just:
+  $ git switch remote-branch
 ==== Changing a local branch to a new remote branch ====
@@ Line 96: / Line 124: @@
 git switch main
 git branch -d bugfix/JIRA-1-new-bugfix
+git pull
+</code>
+====== Resolving a Merge Conflict ======
+<code>
+git mergetool (possibly with filename)  # Bring up the vim 3-way diff
+# +----------+-----------+------------------+
+# | (others) | (common)  | (my most recent) |
+# | LOCAL    | BASE      | REMOTE           |
+# +-----------------------------------------+
+# |                                         |
+# | temp file with <<< ||| >>> diffs        |
+# +-----------------------------------------+
+git commit -a -m "Resolved merge conflict"
+</code>
+Possibly keep rebasing.
+<code>
+git rebase --continue
 git pull
 </code>
@@ Line 122: / Line 172: @@
 <code bash>
 git pull --rebase  # --dry-run to test first
+</code>
+====== Applying changes in a stash to a changed file =====
+When ''git stash apply'' doesn't work: Show the stash changes and pipe that to patch. Now you have a patch you can apply.
+<code>
+git stash show -p | patch -p0
 </code>
@@ Line 166: / Line 224: @@
 </code>
-I could've used gitweb but I used GitHub-like [[https://github.com/klaussilveira/gitlist|gitlist]] at http://git.dlma.com.
+Options are:
+  * I chose GitHub-like [[https://github.com/klaussilveira/gitlist|gitlist]] for https://git.dlma.com, because it works on my shared server.
+  * [[https://www.reddit.com/r/selfhosted/comments/13hxnf4/selfhosted_git_services_you_dont_need_a_huge/|cgit]] might work
+  * [[https://gogs.io/|gogs]]
+  * [[https://git-scm.com/book/en/v2/Git-on-the-Server-GitWeb|GitWeb]] (the one built-in.)
 ====== Limit scope of huge repos ======
@@ Line 183: / Line 247: @@
 git pull --no-tags origin main
 git submodule foreach git pull --no-tags origin main
+</code>
+The submodule one is an optimization for the more general:
+<code bash>
+git submodule update --recursive  # Add --init before --recursive on first time
+</code>
+====== Submodules ======
+[[https://www.cyberdemon.org/2024/03/20/submodules.html|Demystifying git submodules]] is [[https://social.jvns.ca/@b0rk/112604915327918216|summarized by Julia Evans in a 'zine page here]].
+Cloning a repo doesn't download its submodules. After cloning, run:
+<code bash>
+git submodule update --init --recursive
+</code>
+Git pull and checkout don't update submodules. To actually update them, you have to run the following every time you switch branches or pull.
+<code bash>
+git submodule update --recursive  # Add --init before --recursive on first time
 </code>