Differences

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

--- git_cheat_sheet [2022/09/13 23:25] – [How PRs work] stephen
+++ git_cheat_sheet [2024/06/17 09:49] (current) – external edit 127.0.0.1
@@ Line 21: / Line 21: @@
 	editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession
 	pager = cat
+	longpaths = true
 [user]
@@ Line 57: / Line 58: @@
 	st = status
 	ci = commit -m
-	ca = commit --amend
+	ca = commit --amend --no-edit
 	br = branch
 	ba = branch -a
@@ Line 65: / Line 66: @@
 	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 137: @@
 | ''<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 147: @@
 | ''<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 remote -v</nowiki>'' | View remote / origin URL. |
 ===== Workflows =====
@@ Line 263: / Line 269: @@
 <code>
 git svn clone https://ares/svn/SVNRepository/Presentations --no-metadata --tags=Tags --trunk=Trunk --branches=Branches --authors-file=..\users.txt
+</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>