From a9a637529712ac71e586e0d38d025b570ed71113 Mon Sep 17 00:00:00 2001
From: Charles Clark <clark895@purdue.edu>
Date: Tue, 5 Sep 2023 11:15:15 -0400
Subject: [PATCH 1/2] I want no bagels

---
 README.md                            |   2 ++
 ~$tro to Git in the Pienaar Lab.docx | Bin 0 -> 162 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 ~$tro to Git in the Pienaar Lab.docx

diff --git a/README.md b/README.md
index 2d21065..0ac3624 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Figuring out what to order next time
 | Cinnamon Crunch | Alexis | 1
 | everything | Mothi | 1
 | Cinnamon Crunch | Trevor | 1 |
+| None | Charles |  
 
 ###### Smear
 Plain
@@ -39,3 +40,4 @@ Dairy Free Plain
 - Nissa
 
 - Claudia
+- Charles 
\ No newline at end of file
diff --git a/~$tro to Git in the Pienaar Lab.docx b/~$tro to Git in the Pienaar Lab.docx
new file mode 100644
index 0000000000000000000000000000000000000000..f911af5eb14a33da2385c976bd3dab221c79367f
GIT binary patch
literal 162
zcmd;e&PXiENi9}z&PgoFW*`#qGB`72FeEY*G2}3$G88i?0Qos!KB^H+Q1j-CvVmFI
qysK4MAKYZLclmwtvJ(SC;r)ZJKzxn~>-Wk6Ra{@nQT4YT)e!&^nj0(t

literal 0
HcmV?d00001


From eafcf34ead6ab5fdc9d34faddb18b62b797babc3 Mon Sep 17 00:00:00 2001
From: Charles Clark <clark895@purdue.edu>
Date: Tue, 5 Sep 2023 11:23:25 -0400
Subject: [PATCH 2/2] test

---
 ~/.gitconfig | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 ~/.gitconfig

diff --git a/~/.gitconfig b/~/.gitconfig
new file mode 100644
index 0000000..638a1ac
--- /dev/null
+++ b/~/.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"
\ No newline at end of file