Differences

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

--- git [2023/01/06 17:58]
dblume Add mention you can pull --rebase if you feel lucky
+++ git [2023/03/21 09:54] (current)
dblume
@@ Line 1: / Line 1: @@
 ====== git ======
-Make the clone at the remote repository.
+Make the clone of the remote repository.
 <code>
@@ Line 11: / Line 11: @@
 </code>
-Double checking the remote names...
+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 remote -v
+git clone \
-origin  git@github.com:dblume/get-shit-done (fetch)
+  --filter=blob:none \
-origin  git@github.com:dblume/get-shit-done (push)
+  -b main \
-upstream        git://github.com/icambridge/get-shit-done (fetch)
+  --single-branch \
-upstream        git://github.com/icambridge/get-shit-done (push)
+  --no-tags \
+  --shallow-submodules \
+  --recurse-submodules=os/components/toolchain \
+  --recurse-submodules=':(exclude)**/porting_kit:' \
+  git@fake.github.com:project/project.git
 </code>
@@ Line 48: / Line 52: @@
 <code bash>
-$ git fetch --all  # TODO investigate why fetch
+$ git fetch --all  # Bring your copy of the remote up-to-date
 $ git remote prune origin  # (where origin is the name of the shared repo)
 </code>
@@ Line 64: / Line 68: @@
   $ 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 132: / Line 141: @@
 <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 177: / Line 194: @@
 I could've used gitweb but I used GitHub-like [[https://github.com/klaussilveira/gitlist|gitlist]] at http://git.dlma.com.
+====== Limit scope of huge repos ======
+Create a .gitconfig file at the base of your repo:
+<file git .gitconfig>
+[remote "origin"]
+    fetch = +refs/heads/main:refs/remotes/origin/main
+    fetch = +refs/heads/user/dblume/*:refs/remotes/origin/user/dblume/*
+    tagopt = --no-tags
+</file>
+Or explicitly specify your flags:
+<code bash>
+git fetch --no-tags origin main
+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>
 ====== git vim mergetool on macOS ======

User Tools

Site Tools

Differences

Page Tools