Stephen's Wiki

User Tools

Site Tools

Trace: • sql_cheat_sheet
git_cheat_sheet

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_cheat_sheet [2022/09/13 23:15] – stephengit_cheat_sheet [2026/08/07 05:01] (current) – stephen
Line 18: Line 18:
  
 <code text> <code text>
-[core] 
- editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession 
- pager = cat 
- 
 [user] [user]
  name = Stephen Heise  name = Stephen Heise
Line 28: Line 24:
 [init] [init]
  defaultBranch = main  defaultBranch = main
- 
-[mergetool] 
- prompt = false 
- keepBackup = false 
- keepTemporaries = false 
- 
-[merge] 
- tool = winmerge 
- 
-[mergetool "winmerge"] 
- name = WinMerge 
- trustExitCode = true 
- cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED 
- 
-[diff] 
- tool = winmerge 
- 
-[difftool "winmerge"] 
- name = WinMerge 
- trustExitCode = true 
- cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE 
  
 [push] [push]
Line 54: Line 29:
  autoSetupRemote = true  autoSetupRemote = true
    
 +[remote "origin"]
 + prune = true
 +
 [alias] [alias]
  st = status  st = status
  ci = commit -m  ci = commit -m
- ca = commit --amend+ ca = commit --amend --no-edit 
 + cu = reset HEAD~ 
 + cuh = reset --hard HEAD~
  br = branch  br = branch
  ba = branch -a  ba = branch -a
Line 65: Line 45:
  fa = fetch -a  fa = fetch -a
  tf = !git reset && git checkout -- . && git clean -df  tf = !git reset && git checkout -- . && git clean -df
 + as = !git add . && git stash
 + pr = !git stash pop && git reset
  brdr = push --delete origin  brdr = push --delete origin
  fp = push --force  fp = push --force
Line 72: Line 54:
  ro2mfp = !git ro2m && echo 'Force pushing' && git fp  ro2mfp = !git ro2m && echo 'Force pushing' && git fp
  
-[winUpdater] +# Linux only 
- recentlySeenVersion = 2.15.1.windows.2+[credential] 
 + helper = /usr/local/bin/git-credential-manager 
 + credentialStore = secretservice
  
-[remote "origin"] +[credential "https://dev.azure.com"] 
- prune = true+ useHttpPath = true 
 + 
 +# Windows only 
 +[core] 
 + editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession 
 + pager = cat 
 + longpaths = true 
 + 
 +[mergetool] 
 + prompt = false 
 + keepBackup = false 
 + keepTemporaries = false 
 + 
 +[merge] 
 + tool = winmerge 
 + 
 +[mergetool "winmerge"] 
 + name = WinMerge 
 + trustExitCode = true 
 + cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED 
 + 
 +[diff] 
 + tool = winmerge 
 + 
 +[difftool "winmerge"] 
 + name = WinMerge 
 + trustExitCode = true 
 + cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE
 </code> </code>
  
Line 97: Line 108:
  
 ''<nowiki>git config --list --show-origin</nowiki>'' ''<nowiki>git config --list --show-origin</nowiki>''
 +
 +===== Install on Linux =====
 +
 +  - Install Git Credential Manager
 +    - ''<nowiki>sudo apt-get update</nowiki>''
 +    - ''<nowiki>sudo apt-get install git-credential-manager</nowiki>''
 +    - Or download from [[https://github.com/git-ecosystem/git-credential-manager/releases]], assets, gcm-linux-x64-2.x.x.deb.
 +  - Configure Git to use Git Credential Manager
 +    - ''<nowiki>git config --global credential.helper manager</nowiki>''
 +  - Select the credential store backend
 +    - ''<nowiki>git config --global credential.credentialStore secretservice</nowiki>''
 +  - Verify GNOME Keyring (Secret Service) is running
 +    - Run: ''<nowiki>ps aux | grep keyring</nowiki>'', look for ''<nowiki>gnome-keyring-daemon</nowiki>''.
 +    - If missing, start it with: ''<nowiki>gnome-keyring-daemon --start --components=secrets</nowiki>''
 +
  
 ===== Try Git ===== ===== Try Git =====
Line 134: Line 160:
 | ''<nowiki>git push origin <hash>:<branch></nowiki>'' | Push up to a certain commit. | | ''<nowiki>git push origin <hash>:<branch></nowiki>'' | Push up to a certain commit. |
 | ''<nowiki>git push origin HEAD~10:<branch></nowiki>'' | Push up to the last 10 commits. | | ''<nowiki>git push origin HEAD~10:<branch></nowiki>'' | Push up to the last 10 commits. |
 +| ''<nowiki>git push origin HEAD~10:$(git rev-parse --abbrev-ref HEAD)</nowiki>'' | Push up to the last 10 commits. |
 +| ''<nowiki>git push --force origin HEAD~10:$(git rev-parse --abbrev-ref HEAD)</nowiki>'' | Force push up to the last 10 commits. |
 | ''<nowiki>gitk</nowiki>'' | A commit viewer. | | ''<nowiki>gitk</nowiki>'' | A commit viewer. |
-| ''<nowiki>gitk 'stash@{0}'</nowiki>'' | View the contents of the first stash. | 
 | ''<nowiki>gitk --all $(git fsck --no-reflog | Select-String "(dangling commit )(.*)" | %{ $_.Line.Split(' ')[2] })</nowiki>'' | Find a dropped stash. | | ''<nowiki>gitk --all $(git fsck --no-reflog | Select-String "(dangling commit )(.*)" | %{ $_.Line.Split(' ')[2] })</nowiki>'' | Find a dropped stash. |
 | ''<nowiki>git tag -a <tagname> -m "commit comment"</nowiki>'' | Annotated tag (preferred over lightweight tags). | | ''<nowiki>git tag -a <tagname> -m "commit comment"</nowiki>'' | Annotated tag (preferred over lightweight tags). |
Line 142: Line 169:
 | ''<nowiki>git log --no-merges --oneline develop..</nowiki>'' | Show all commits on the current branch. | | ''<nowiki>git log --no-merges --oneline develop..</nowiki>'' | Show all commits on the current branch. |
 | ''<nowiki>git cherry-pick ebe6942^..905e279</nowiki>'' | Cherry-pick an //inclusive// commit range. | | ''<nowiki>git cherry-pick ebe6942^..905e279</nowiki>'' | Cherry-pick an //inclusive// commit range. |
 +| ''<nowiki>git --git-dir=../<other repo>/.git format-patch -k -1 --stdout <commit hash> | git am -3 -k</nowiki>'' | 'Cherry pick' a commit from another repo. |
 +| ''<nowiki>git remote -v</nowiki>'' | View remote / origin URL. |
 +|  Stashing  | |
 +| ''<nowiki>gitk 'stash@{0}'</nowiki>'' | View the contents of the first stash. |
 +| ''<nowiki>git diff stash</nowiki>'' | Shows differences between your current working tree and the most recent stash entry. |
 +| ''<nowiki>git diff stash@{0}</nowiki>'' | Shows differences against a specific stash entry (here, the latest one explicitly). |
 +| ''<nowiki>git diff --name-only stash</nowiki>'' | Lists only file names that differ between your working tree and the stash. |
 +| ''<nowiki>git diff stash -- path/to/file.cs</nowiki>'' | Shows differences against the stash for only the specified file. |
 +
 +
 +
  
 ===== Workflows ===== ===== Workflows =====
Line 265: Line 303:
 </code> </code>
  
 +===== Who needs to clean up =====
 +
 +Lists the author and date of the last commit on each remote branch.
 +
 +Bash:
 +<code bash>
 +for branch in `git branch -r | grep -v HEAD`;do echo -e `git show --format="%ai %ar by %an" $branch | head -n 1` \\t$branch; done | sort -r
 +</code>
 +
 +Powershell:
 +<code powershell>
 +git branch -r | Where-Object { $_ -notmatch 'HEAD' } | ForEach-Object {
 +    $branch = $_.Trim()
 +    $info = git show --format="%ai %ar by %an" $branch | Select-Object -First 1
 +    [PSCustomObject]@{
 +        Info = $info
 +        Branch = $branch
 +    }
 +} | Sort-Object Info -Descending | Format-Table -AutoSize
 +</code>
 ===== How PRs work ===== ===== How PRs work =====
  
 When you create a PR on GitHub, it also creates some other refs for you. Different providers put these in different locations. When you create a PR on GitHub, it also creates some other refs for you. Different providers put these in different locations.
  
-GitHub puts them under refs/pulls. I don’t believe that git has any rules around these refs, providers can define them however they want.+GitHub puts them under ''refs/pulls''. I don’t believe that git has any rules around these refs, providers can define them however they want. 
 + 
 +If you run ''git ls-remote <remote-name>'' on a repo, you’ll see all of these other magic refs coming through.
  
-If you run git ls-remote <remote-name> on a repo, you’ll see all of these other magic refs coming through. 
 On a GitHub repo with some active and completed pull requests, I see these ones (PR #2 has been closed, PR #1 is still open): On a GitHub repo with some active and completed pull requests, I see these ones (PR #2 has been closed, PR #1 is still open):
-5003f86523fa07e325d28f50a749685b93dffcf3 refs/pull/1/head 
-57c72505a9beed608fe73f474e77b70cd182616f refs/pull/1/merge 
-622ba67a9d1279984dc763eb078d0e5d92ae790f refs/pull/2/head 
-I believe that pull/1/head points to the head of the source branch. Source branch is dev, and it’s pointing at the same commit, so that seems correct 5003f86523fa07e325d28f50a749685b93dffcf3 refs/heads/dev. 
-pull/1/merge is what I think they’re referring to as the ‘merge branch’. It’s what the target branch will look like once the PR has merged. 
-Note that it’s a different commit hash to main 7adb1c92faa0ef0065e3aedb95fcdc4f523d79e3 refs/heads/main because it’s a different commit. (edited)  
  
 +  5003f86523fa07e325d28f50a749685b93dffcf3 refs/pull/1/head
 +  57c72505a9beed608fe73f474e77b70cd182616f refs/pull/1/merge
 +  622ba67a9d1279984dc763eb078d0e5d92ae790f refs/pull/2/head
 +
 +I believe that ''pull/1/head'' points to the head of the source branch. Source branch is ''dev'', and it’s pointing at the same commit, so that seems correct ''5003f86523fa07e325d28f50a749685b93dffcf3 refs/heads/dev''.
 +
 +''pull/1/merge'' is what I think they’re referring to as the ‘merge branch’. It’s what the target branch will look like once the PR has merged.
 +
 +Note that it’s a different commit hash to main ''7adb1c92faa0ef0065e3aedb95fcdc4f523d79e3 refs/heads/main'' because it’s a different commit.
  
-Dylan Lerch 
-  17 hours ago 
 Now… to show when and how this changes I’ll need to create a new PR because there are conflicts on that example PR that I’m using. Now… to show when and how this changes I’ll need to create a new PR because there are conflicts on that example PR that I’m using.
-As a side note: It seems as though these refs/pulls/<number>/merge refs just stay where they are if there are conflicts. They don’t go away, they just don’t update. Anyway… 
-Say we have a default branch main and some branch with some changes called some-changes. Here is what the refs look like on the remote. 
-a94afcad87e765e18d590cc4090a835e210acca6 refs/heads/main 
-e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/heads/some-changes 
-Once I create a PR to merge some-changes into main two more refs are added: 
-a94afcad87e765e18d590cc4090a835e210acca6 refs/heads/main 
-e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/heads/some-changes 
-e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/pull/3/head 
-6b33d262276e1e5d520ffb8063dedffd6296664d refs/pull/3/merge 
-Note pull/3/head is the same as heads/some-changes. pull/3/merge is pointing to some other magic commit that doesn’t really exist anywhere. That’s GitHub merging it in the background and creating a ref of what it will look like. 
-If I push changes to main, here is what our refs look like: 
-442fcf2d421c26f75339a82bd364d5fcc3bc0a52 refs/heads/main 
-e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/heads/some-changes 
-e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/pull/3/head 
-3a58fb072ff48e8bebf2c66491332556f3f935ef refs/pull/3/merge 
-heads/main has changed because I made a commit there. pull/3/merge has changed because the merge of those two branches now looks different. heads/some-changes and pull/3/head are the same because they haven’t moved. 
  
 +As a side note: It seems as though these ''refs/pulls/<number>/merge'' refs just stay where they are if there are conflicts. They don’t go away, they just don’t update. Anyway…
 +
 +Say we have a default branch ''main'' and some branch with some changes called ''some-changes''. Here is what the refs look like on the remote.
 +
 +  a94afcad87e765e18d590cc4090a835e210acca6 refs/heads/main
 +  e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/heads/some-changes
 +  
 +Once I create a PR to merge ''some-changes'' into ''main'' two more refs are added:
 +
 +  a94afcad87e765e18d590cc4090a835e210acca6 refs/heads/main
 +  e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/heads/some-changes
 +  e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/pull/3/head
 +  6b33d262276e1e5d520ffb8063dedffd6296664d refs/pull/3/merge
 +  
 +Note ''pull/3/head'' is the same as ''heads/some-changes''. ''pull/3/merge'' is pointing to some other magic commit that doesn’t really exist anywhere. That’s GitHub merging it in the background and creating a ref of what it will look like.
 +
 +If I push changes to ''main'', here is what our refs look like:
 +
 +  442fcf2d421c26f75339a82bd364d5fcc3bc0a52 refs/heads/main
 +  e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/heads/some-changes
 +  e6317c4e97a465fe2f024e5a3cd5ff3f12c5f6a6 refs/pull/3/head
 +  3a58fb072ff48e8bebf2c66491332556f3f935ef refs/pull/3/merge
 +
 +''heads/main'' has changed because I made a commit there. ''pull/3/merge'' has changed because the merge of those two branches now looks different. ''heads/some-changes'' and ''pull/3/head'' are the same because they haven’t moved.
  
-Dylan Lerch 
-  17 hours ago 
 As for what these branches are used for: This is very useful for making sure that your code will still be valid after the merge is complete (not just in your branch). As for what these branches are used for: This is very useful for making sure that your code will still be valid after the merge is complete (not just in your branch).
-If there are any changes to the source or target branches, refs/pull/<number>/merge will update. Useful for stopping poison merges.+If there are any changes to the source or target branches, ''refs/pull/<number>/merge'' will update. Useful for stopping poison merges.
  
  
git_cheat_sheet.1663110926.txt.gz · Last modified: 2022/09/15 00:15 (external edit)
Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki