move separate repo into this one

grantwinney · grantwinney · commit ed6544f4ee92 · 2024-08-04T22:29:12.000-04:00
diff --git a/DevTools/GitAliasTemplate/README.md b/DevTools/GitAliasTemplate/README.md
@@ -0,0 +1,21 @@
+Git's "alias" feature provides a way for you to create shortcuts for other Git commands, which can save you a lot of time in the long run. If you want to learn more, [I wrote a bit about it here](https://grantwinney.com/what-is-a-git-alias-and-how-do-i-use-it/).
+
+The `*.gitconfig` files in this repo are a collection of some useful aliases I created, some for long git commands or chains of commands, and others for common typos.
+
+If you'd like to use them, you don't have to copy/paste anything. Instead, clone the repository and reference it from within your existing `.gitconfig` file, which has the added benefit of leaving your existing aliases and other settings untouched. Add the following section to your `.gitconfig` file, where `/your/path` is wherever you cloned the repo to.
+
+```
+[include]
+    path = "/your/path/git-alias-template/alias-shortcuts.gitconfig"
+    path = "/your/path/git-alias-template/alias-typos.gitconfig"
+    # etc...
+```
+
+The `include` section imports settings from other files and merges their functionality without affecting the original config file.
+
+You can read more about Git aliases here:
+
+* [GitHowTo: Aliases](https://githowto.com/aliases)
+* [Pro Git: 2.7 Git Basics – Git Aliases](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases)
+
+Do you have any especially useful aliases of your own that you couldn't live without? If you want to share them, feel free to [create a pull request](https://help.github.com/articles/creating-a-pull-request/) and I'll check them out.
diff --git a/DevTools/GitAliasTemplate/alias-shortcuts.gitconfig b/DevTools/GitAliasTemplate/alias-shortcuts.gitconfig
@@ -0,0 +1,43 @@
+[alias]
+  co = checkout
+  cob = checkout -b
+  ci = commit -m
+  ec = config --global --edit
+  st = status
+  br = branch
+  df = diff
+  re = checkout .
+  pop = stash pop
+  rclone = clone --recursive
+
+  # recursively pull repo and its submodule (if any)
+  rpull = !git pull && git submodule update --init --recursive
+
+  # list commits in short form, with colors and branch/tag annotations
+  hist = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --date=short
+  hsit = !git hist
+
+  # similar to hist but includes a list of files changed in commit
+  histf = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --numstat
+  hsitf = !git histf
+
+  # graph view of a project's commit history
+  histg = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+  hsitg = !git histg
+
+  # add and commit changes, with and without a message
+  ac = !git add . && git commit -m \"$1\" && :
+  acnc = !git add . && git commit --allow-empty-message -m \"\"
+
+  # add and commit AND PUSH changes, with and without a message
+  shove = !git add . && git commit -m \"$1\" && git push origin && :
+  shovenc = !git add . && git commit --allow-empty-message -m \"\" && git push origin
+
+  # display your currently defined aliases
+  aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
+
+  # pass in the name or email address of someone involved with the project
+  whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
+
+  # open the url for the current repo in the browser
+  browse = "!open `git remote -v | grep fetch | awk '{print $2}' | sed 's=git@=https://=' | sed 's=com:=com/='`"
diff --git a/DevTools/GitAliasTemplate/alias-typos.gitconfig b/DevTools/GitAliasTemplate/alias-typos.gitconfig
@@ -0,0 +1,15 @@
+[alias]
+  upsh = push
+  psuh = push
+  puhs = push
+  pushh = push
+  pll = pull
+  pul = pull
+  pulll = pull
+  puill = pull
+  commti = commit
+  comtmi = commit
+  cmmit = commit
+  comit = commit
+  committ = commit
+  stauts = status
