Differences

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

--- git [2018/05/09 16:00] – thekojukinator
+++ git [2019/05/08 16:08] (current) – [PowerShell Visual Studio Code Template] thekojukinator
@@ Line 7: / Line 7: @@
   * https://www.atlassian.com/git/tutorials - More great tutorials here.
   * https://help.github.com - GitHub documentation.
+  * https://guides.github.com/features/mastering-markdown - Markdown reference.
 I was using ''git version 2.16.2.windows.1'' in the //Bash// shell while documenting and testing these commands.
@@ Line 34: / Line 35: @@
 </code>
+A complementary setting in //Visual Studio Code// when developing on Windows is to enforce CRLF.
+<code css settings.json>
+{
+    // this assumes Windows dev environment with Git config option "core.autocrlf=true"
+    "files.eol": "\r\n"
+}
+</code>
 ==== Pretty Log Alias ====
@@ Line 42: / Line 51: @@
 <code bash>
 git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
+# or without pagination
+git --no-pager log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
 </code>
@@ Line 48: / Line 59: @@
 <code bash>
 git config --global alias.hist "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short"
+# unfortunately these won't work...
+git config --global alias.hist "--no-pager log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short"
+git config --global alias.hist "!git --no-pager log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short"
+# but, this will disable pagination for all calls to 'log'
+git config --global pager.log false
+# I've recently discovered some prettier log outputs, so my .gitconfig aliases are like so...
+hist = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
+hist1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
+hist2 = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+# first two are courtesy of https://stackoverflow.com/a/9074343
 </code>
@@ Line 89: / Line 111: @@
 git config -l
 # show global settings only
+# these live in the user profile
 git config --global -l
 # show system settings only
+# these live in the git installation path
 git config --system -l
-# show repo settings only (must be in repo folder)
+# show local settings only
+# these live in the repo
 git config --local -l
 </code>
@@ Line 275: / Line 300: @@
 git remote set-branches --add origin dev1
 </code>
+When a tag is removed from the local **repo** it will not be removed from the remote **repo** via standard ''git push'' or even ''git push --all'', but there is a way to do it.
+<code bash>
+# delete <tag> from <remoterepo>
+git push <remoterepo> :<tag>
+# ex:
+git push origin :v1.0
+</code>
+Alternatively, if new tags were created but there are no new commits, it's possible to push the tags to the remote **repo** via ''git push --tags''.
 ===== Stage, Confirm, Commit, and Tag =====
@@ Line 522: / Line 558: @@
 !*/
-# allow .gitignore at top level
+# allow .git* at top level
-!.gitignore
+!.git*
-# whitelist these file types everywhere
+# allow .md at top level
-!**/*.ps1
+!*.md
-!**/*.psm1
-!**/*.psd1
+# whitelist VSCode settings at the top level
-!**/*.xml
+!/.vscode/settings.json
+# whitelist contents of these folders at the top level
+!/ProjectFolderContainingAllTheGoodies/**
+# regardless of above, ignore these folders and files everywhere
+**/_logs*
+**/_testing*
-# regardless of above, ignore '.vscode' folder everywhere
-**\.vscode/
 </code>