User Tools

Site Tools

Trace:
git

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
git [2022/04/08 08:23] – Add instructions for rebasing dblumegit [2025/07/08 16:13] (current) – [Building Git] dblume
Line 1: Line 1:
 ====== git ====== ====== git ======
  
-Make the clone at the remote repository.+===== Building Git =====
  
-<code> +In Ubuntu, get some dev libs first:
-git clone git@github.com:dblume/get-shit-done +
-</code>+
  
-<code> +<code bash> 
-git remote add upstream git://github.com/icambridge/get-shit-done+sudo apt-get install libssl-dev libcurl4-gnutls-dev gettext
 </code> </code>
 +There was [[https://lore.kernel.org/git/xmqq5xg2wrd1.fsf@gitster.g/|a security fix in 2.50.1]], so here we get that one:
 +<code bash>
 +git clone --filter=blob:none -b v2.50.1 --single-branch --no-tags https://github.com/git/git
 +# or: git clone --branch v2.50.1 --depth 1 https://github.com/git/git
 +# or even: wget https://www.kernel.org/pub/software/scm/git/git-2.50.1.tar.xz
  
-Enter a comment for the commit.  See section 2.7.2 [[http://cworth.org/hgbook-git/tour/|here]]. +make prefix=$HOME/.local -j$(nproc) 
-<code> +make prefix=$HOME/.local install
-git commit -a+
 </code> </code>
  
-Double checking the alias names...+This will put git in ''$HOME/.local/bin/''
  
-<code> +===== Using Git =====
-$ 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:+Make the clone of the remote repository.
  
 <code> <code>
-git push origin+git clone git@github.com:dblume/get-shit-done
 </code> </code>
- 
-===== Make a local clone of an existing remote project ===== 
- 
-From the parent directory: 
  
 <code> <code>
-git clone https://github.com/realpython/interview-questions.git python-interview +git remote add upstream git://github.com/icambridge/get-shit-done
-cd python-interview+
 </code> </code>
  
-===== When it's time to commit ===== +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...
- +
-**1.** Check which files are staged for commit.+
  
 <code> <code>
-git status+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> </code>
  
-**2.** Then, when you're ready to commit locally,+Eventually, if you want to add another branch to a single-branch clone:
  
-<code> +  git remote set-branches --add origin another-branch
-git commit -a -m "Some useful comment" +
-</code>+
  
-**3.** When you're ready to push a local commit to a remote one...+Or to de-single-branch-ize a clone:
  
-<code> +  git remote set-branches origin "*"
-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 ===== ===== Creating a new remote repository from an existing local one =====
Line 76: Line 64:
 git add README.md git add README.md
 git commit -m "first commit" 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 master +git push -u origin main
-</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> </code>
  
Line 113: Line 82:
  
 <code bash> <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) $ git remote prune origin  # (where origin is the name of the shared repo)
 </code> </code>
Line 120: Line 89:
 ==== Creating a branch (and possibly pushing to upstream origin) ==== ==== 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'   Switched to a new branch 'new_branch'
  
Line 129: Line 98:
   $ git push --set-upstream origin new_branch   $ 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 ==== ==== Changing a local branch to a new remote branch ====
  
Line 155: Line 129:
  
 <code bash> <code bash>
-git checkout -b bugfix/JIRA-1-new-bugfix +git switch -c bugfix/JIRA-1-new-bugfix 
-# If main is getting updated, occasionally rebase like so: + 
-#   git checkout main+# If main is getting updated, rebase like so: 
 +#   git switch main
 #   git pull #   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  # Moves head back 3, and those 3 become staged 
 git commit -m "fixed bug" git commit -m "fixed bug"
 git push --set-upstream origin bugfix/JIRA-1-new-bugfix 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 branch -d bugfix/JIRA-1-new-bugfix
 git pull 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> </code>
  
Line 179: Line 231:
 git$ cd testcode.git/ git$ cd testcode.git/
 testcode.git$ git init --bare testcode.git$ git init --bare
 +testcode.git$ git config pack.threads 8  # Otherwise clone might fail with "unable to create thread"
 </code> </code>
  
Line 190: Line 243:
 ... ...
 testcode$ git remote add origin ssh://USERNAME@dlma.com/~/git/testcode.git testcode$ git remote add origin ssh://USERNAME@dlma.com/~/git/testcode.git
-testcode$ git push origin master+testcode$ git push origin main
 </code> </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"
  
git.1649431408.txt.gz · Last modified: 2023/04/12 20:44 (external edit)