Differences

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

--- git [2022/04/25 11:43] – 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 11: / Line 11: @@
 </code>
-Enter a comment for the commit.  See section 2.7.2 [[http://cworth.org/hgbook-git/tour/|here]].
+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 commit -a
-</code>
-Double checking the alias names...
 <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>
-The push that worked from within the local directory:
+Eventually, if you want to add another branch to a single-branch clone:
-<code>
+  git remote set-branches --add origin another-branch
-git push origin
-</code>
-===== Make a local clone of an existing remote project =====
+Or to de-single-branch-ize a clone:
-From the parent directory:
+  git remote set-branches origin "*"
-<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 main
-</code>
-or
-<code>
-git push https://github.com/dblume/netflix-dvd-feed
-</code>
 ===== Creating a new remote repository from an existing local one =====
@@ Line 76: / Line 43: @@
 git add README.md
 git commit -m "first commit"
-git remote add origin https://github.com/dblume/hexbright-factory.git
+git remote add origin git@github.com:dblume/hexbright-factory.git
 git push -u origin main
 </code>
@@ Line 94: / Line 61: @@
 <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 101: / Line 68: @@
 ==== Creating a branch (and possibly pushing to upstream origin) ====
-  $ git checkout -b new_branch
+  $ git switch -c new_branch
   Switched to a new branch 'new_branch'
@@ Line 110: / 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 136: / Line 108: @@
 <code bash>
-git checkout -b bugfix/JIRA-1-new-bugfix
+git switch -c bugfix/JIRA-1-new-bugfix
 # If main is getting updated, rebase like so:
-#   git checkout main
+#   git switch main
 #   git pull
-#   git checkout bugfix/JIRA-1-new-bugfix
+#   git switch bugfix/JIRA-1-new-bugfix
-#   git rebase main
+#   git rebase main  # --dry-run to test first
 # Consider whether you want to squash commits before pushing
-#   git reset --soft HEAD~3
+#   git reset --soft HEAD~3  # Moves head back 3, and those 3 become staged
 git commit -m "fixed bug"
 git push --set-upstream origin bugfix/JIRA-1-new-bugfix
-(do a merge/pull request that deletes the original branch at the remote)
+# Do a MR/PR that deletes the original branch at the remote
-git checkout main
+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>
+====== Alternative to Rebasing: Stash, Pull, Unstash ======
+**[[https://roku.slack.com/archives/C453HNABT/p1657224221440529|Problem]]**:
+> I attempted to rebase my branch to main and end up pulling in all of the intermediate commits on main into my branch, and the merge request suddenly requires approval from unrelated code owners.
+**Workaround**:
+Instead of doing a rebase before commit, stash your changes, set the upstream to origin/main, do a pull, unstash the change, then commit and push -f upstream to the branch. Kind of like this:
+<code bash>
+git stash push -m "hold for pull"
+git switch main
+git pull
+git stash pop  # restores stash on top of main
+git add/commit
+git push -f origin <branchname>
+</code>
+If others have made changes in the branch you're working on, you can try to rebase directly onto the latest from the remote:
+<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>
+====== When using Merge Commits instead of Rebasing ======
+Use ''--first-parent'' with ''git log''.
+====== Two Independent Remotes ======
+After you've already set up one remote, ''origin'', and you want to map your ''main'' to ''other-main'' at ''other-origin'', you can do so like:
+<code bash>
+git remote add other-origin ssh://other.com/project.git
+git fetch other-origin
+git branch --set-upstream-to=other-origin/other-main main
+git pull other-origin other-main --allow-unrelated-histories
+git mergetool <file-with-conflicts>
+... do your pushes and pulls, then to switch back to origin...
+git branch --set-upstream-to=origin/main main
 </code>
@@ Line 179: / 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 ======
+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>
+====== 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>
+====== git vim mergetool on macOS ======
+File /usr/local/Cellar/git/2.38.1/libexec/git-core/mergetools/vimdiff has this line:
+<file bash /usr/local/Cellar/git/2.38.1/libexec/git-core/mergetools/vimdiff>
+FINAL_CMD="-c \"set hidden diffopt-=hiddenoff | $CMD | tabfirst\""
+</file>
+But vim has a problem with "diffopt-=hiddenoff"