Charles5 sep23

README.md

@@ -17,6 +17,7 @@ Figuring out what to order next time
 | everything | Mothi | 1
 | Cinnamon Crunch | Trevor | 6 |
 | Sesame | Meghna | 1 | 
+| None | Charles |  
 
 ###### Smear
 Plain
@@ -41,4 +42,5 @@ Dairy Free Plain
 - Lexi
 - Nissa
 - Claudia
+- Charles 
 - Meghna

~/.gitconfig

@@ -0,0 +1,19 @@
+[user]
+# Please adapt and uncomment the following lines:
+    name = Charles Clark
+    email = clark895@purdue.edu
+[alias]
+lol = log --graph --decorate --pretty=oneline --abbrev-commit
+lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
+#
+# Working with branches
+#
+# Get the current branch name (not so useful in itself, but used in
+# other aliases)
+branch-name = "!git rev-parse --abbrev-ref HEAD"
+# Push current branch
+put = "!git push origin $(git branch-name)"
+# Pull without merging
+get = "!git pull origin $(git branch-name) --ff-only"
+# Pull Master without switching branches
+got = "!f() { CURRENT_BRANCH=$(git branch-name) && git checkout $1 && git pull origin $1 --ff-only && git checkout $CURRENT_BRANCH;  }; f"