Stephen's Wiki

User Tools

Site Tools

Trace:
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 [2021/11/10 21:23] – stephengit_cheat_sheet [2025/10/28 04:33] (current) – stephen
Line 21: Line 21:
  editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession  editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession
  pager = cat  pager = cat
 + longpaths = true
  
 [user] [user]
  name = Stephen Heise  name = Stephen Heise
  email = Stephen@tallguyracing.com  email = Stephen@tallguyracing.com
 +
 +[init]
 + defaultBranch = main
  
 [mergetool] [mergetool]
Line 49: Line 53:
 [push] [push]
  default = current  default = current
 + autoSetupRemote = true 
 + 
 [alias] [alias]
  st = status  st = status
  ci = commit -m  ci = commit -m
- ca = commit --amend+ ca = commit --amend --no-edit
  br = branch  br = branch
  ba = branch -a  ba = branch -a
Line 61: Line 66:
  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
  cp = cherry-pick  cp = cherry-pick
  ln = !git --no-pager log -n50 '--pretty=format:"%Cred%h%Creset %ad %Cgreen%<(10,trunc)%an%Creset %<(80,trunc)%s"' '--date=format:"%Y%m%d %H%M%S"'  ln = !git --no-pager log -n50 '--pretty=format:"%Cred%h%Creset %ad %Cgreen%<(10,trunc)%an%Creset %<(80,trunc)%s"' '--date=format:"%Y%m%d %H%M%S"'
 + ro2m = !echo 'Rebasing onto master' && git fetch origin master:master && git rebase --onto master master && git pull -r origin master
 + ro2mfp = !git ro2m && echo 'Force pushing' && git fp
  
 [winUpdater] [winUpdater]
Line 127: Line 137:
 | ''<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 'stash@{0}'</nowiki>'' | View the contents of the first stash. |
Line 135: Line 147:
 | ''<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. |
  
 ===== Workflows ===== ===== Workflows =====
Line 211: Line 225:
 ==== Rebase onto master ==== ==== Rebase onto master ====
  
 +| ''<nowiki>git fetch origin master:master</nowiki>'' | Update the master branch. |
 | ''<nowiki>git rebase --onto master <source-branch></nowiki>'' | For example, <source-branch> = '2021.3.7946'. | | ''<nowiki>git rebase --onto master <source-branch></nowiki>'' | For example, <source-branch> = '2021.3.7946'. |
 | ''<nowiki>git pull -r origin master</nowiki>'' | | | ''<nowiki>git pull -r origin master</nowiki>'' | |
 | ''<nowiki>git push --force</nowiki>'' | | | ''<nowiki>git push --force</nowiki>'' | |
 +
 +==== Split up an existing commit ====
 +
 +| ''<nowiki>git rebase -i</nowiki>'' | |
 +| Mark commit to be split with 'e' | |
 +| Save & close | |
 +| When the rebasing has stopped... | |
 +| ''<nowiki>git reset HEAD~</nowiki>'' | |
 +| Edit & commit. | |
 +| ''<nowiki>git rebase --continue</nowiki>'' | |
 +
 +==== Set up a bare repo ====
 +
 +| ''<nowiki>git init --bare BareRepo</nowiki>'' | |
 +| ''<nowiki>git clone .\BareRepo\ LocalRepo</nowiki>'' | URL will be something like ''<nowiki>file:///C:/Temp/BareRepo</nowiki>'' |
 +| ''<nowiki>git ci "Initial commit." --allow-empty</nowiki>'' | If you need an initial commit. |
 +
 +==== Create a test repo ====
 +
 +<code powershell>
 +$scriptpath = Split-Path $MyInvocation.MyCommand.Path
 +Push-Location $scriptpath
 +
 +$remoteRepoName = 'RemoteRepo'
 +$localRepoName = 'LocalRepo'
 +
 +mkdir $remoteRepoName
 +git init --bare $remoteRepoName
 +git clone $remoteRepoName $localRepoName
 +
 +# Create an initial commit - optional
 +git --git-dir "$localRepoName/.git" commit --allow-empty -m 'Initial commit.'
 +git --git-dir "$localRepoName/.git" push
 +
 +Pop-Location
 +</code>
  
 ===== Import from SVN ===== ===== Import from SVN =====
Line 220: Line 271:
 git svn clone https://ares/svn/SVNRepository/Presentations --no-metadata --tags=Tags --trunk=Trunk --branches=Branches --authors-file=..\users.txt git svn clone https://ares/svn/SVNRepository/Presentations --no-metadata --tags=Tags --trunk=Trunk --branches=Branches --authors-file=..\users.txt
 </code> </code>
 +
 +===== Who needs to clean up =====
 +
 +Lists the author and date of the last commit on each remote branch. Need to run it on bash.
 +
 +<code>
 +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>
 +
 +===== 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.
 +
 +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.
 +
 +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.
 +
 +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 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.
 +
  
git_cheat_sheet.1636579394.txt.gz · Last modified: 2021/11/11 22:23 (external edit)
Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki