Differences

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

--- git_cheat_sheet [2026/05/19 22:30] – [Try Git] stephen
+++ git_cheat_sheet [2026/08/07 05:01] (current) – stephen
@@ Line 18: / Line 18: @@
 <code text>
-[core]
-	editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession
-	pager = cat
-	longpaths = true
 [user]
 	name = Stephen Heise
@@ Line 29: / Line 24: @@
 [init]
 	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]
@@ Line 55: / Line 29: @@
 	autoSetupRemote = true
+[remote "origin"]
+	prune = true
 [alias]
 	st = status
@@ Line 77: / Line 54: @@
 	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>