Githelp.txt

• Stuff in ALL_CAPS needs to be filled in.
• Never work in your master branch, it should always be a copy of upstream/master
• Branch names are generally all-lowercase-with-dashes-between-words
• Commit messages should use present-tense imperative verbs. (Change, not Changed)

------------

Download a repo from github to work on it locally (From parent folder)
You want to download *your* repo that you forked from the main project.
    git clone https://github.com/SOME_PERSON/SOME_PROJECT.git
    git clone https://github.com/YOUR_USERNAME/runelite.git

Add remote (You should add the main project as a remote)
    git remote add REMOTE_NAME https://github.com/SOME_PERSON/SOME_PROJECT.git
    git remote add upstream https://github.com/runelite/runelite.git

Rename remote
    git remote rename OLD_REMOTE_NAME NEW_REMOTE_NAME

Check remotes
    git remote -v

Check remote branches
    git branch -r

Delete remote
    git remote rm REMOTE_NAME

------------

Create a new branch (will copy from your current branch)
    git checkout -b BRANCH_NAME

Change current branch
    git checkout BRANCH_NAME

Check branches
    git branch -v

Delete remote branch
    git push -d REMOTE_NAME BRANCH_NAME

Delete local branch
    git branch -d BRANCH_NAME

------------

Check the status of the current branch.
Files modified/added/removed will be in red, files in the staging area in green
    git status

Check the difference between modified files and your last commit
    git diff --ignore-space-at-eol (ignores changes in line break type)
    git diff

Add a modified/added/removed file to the staging area
    git add FILE_NAME.txt
    git add *.txt

Remove a modified/added/removed file from the staging area
    git reset FILE_NAME.txt

Add ALL modified/added/removed to the staging area (Capital A required)
    git add -A

Commit with a descriptive message saying what you did
    git commit -m "COMMIT_MESSAGE"

------------

Push branch to github
    git push remotename branchname

Pull branch from github
    git pull remotename branchname

------------

Fetch branches from remote (do this before rebasing)
    git fetch REMOTE_NAME
    git fetch upstream

Switch to master branch
    git checkout master

Rebase changes from upstream to local copy
    git rebase REMOTE_NAME/BRANCH_NAME
    git rebase upstream/master

Switch to feature/working branch
    git checkout BRANCH_NAME

Rebase local branch from local master branch
    git rebase BRANCH_NAME
    git rebase master

If there are merge conflicts, open the conflicting file in a text
editor and decide between the lines above or below the ===== line
then do:
    git add FILE_NAME.txt
    git rebase --continue

------------

Make git not use a pager for long results
    git config core.pager cat

------------

Add somebody else's fork as a remote
    git remote add sethtroll https://github.com/sethtroll/runelite.git
    git fetch sethtroll
    git merge --no-edit sethtroll/addshiftclicktag

------------

See last 5 commits
    git log -n 5

Show info about a certain commit id
    git show COMMIT_ID

Interactive rebase (for editing history)
    git rebase --interactive PARENT_OF_FLAWED_COMMIT_ID

Get count of of commits behind and ahead (respectively) of master
    git rev-list --left-right --count master...BRANCH_NAME