GitCommitsForNonGitUsers.md

#Git Commits For Non-Git Users

This is a guide to aid others not familiar with git to contribute to our TIL repo.

FIRST TIME SETUP

• copy clone to clipboard
  
• Run the following commands in your shell: git clone <PASTE CLIPBOARD>

TO SUBMIT

• git pull origin master
• git checkout -b <BRANCHNAME>
• add files/folders locally
• git add . to add everything in cur dir
• git commit
• press i to enter insert mode, write title & message
• ESC :wq to write-quit
• git push origin <BRANCHNAME>
• Compare & Pull Request on website

TO CHANGE

• git status to see changed files in red
• git add .
• git status to see updated files in green
• git commit ( -m "MESSAGE" to skip Vim)
• git push origin <BRANCHNAME>

TO SQUASH

• git fetch origin
• git rebase -i origin/master
• squash to 1 in vim; :wq
• reword commit messages
• git push -f origin <BRANCHNAME>

TO MERGE

• git log to view the list of commits on the current branch
• git checkout master
• git pull origin master to be up to date
• git merge <BRANCHNAME>
• git push origin master
• Delete branch from web UI
• git branch -d <BRANCHNAME> to delete branch locally