Differences

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

--- git_cheat_sheet [2022/11/30 22:26] – [Install] stephen
+++ git_cheat_sheet [2025/12/04 00:38] (current) – [Who needs to clean up] stephen
@@ Line 21: / Line 21: @@
 	editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession
 	pager = cat
+	longpaths = true
 [user]
@@ Line 58: / Line 59: @@
 	ci = commit -m
 	ca = commit --amend --no-edit
+	cu = reset HEAD~
+	cuh = reset --hard HEAD~
 	br = branch
 	ba = branch -a
@@ Line 65: / Line 68: @@
 	fa = fetch -a
 	tf = !git reset && git checkout -- . && git clean -df
+	as = !git add . && git stash
+	pr = !git stash pop && git reset
 	brdr = push --delete origin
 	fp = push --force
@@ Line 134: / Line 139: @@
 | ''<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:$(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 'stash@{0}'</nowiki>'' | View the contents of the first stash. |
@@ Line 142: / Line 149: @@
 | ''<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 --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 =====
@@ Line 265: / Line 274: @@
 </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 =====