Useful Git Commands

These are git commands that could be useful for working from this repository, however, you're free use any software or workflow you like to push changes, create PRs, address requested changes, fix merge conflicts, etc. as long as your PR is approved and GitHub Actions pass.

For additional git commands, try starting reading from here.

---

Useful git commands with description

git pull <remote name> <branch name> - Will fetch and try to merge changes from a remote branch of the same name as the local branch into the local branch.

git add <file name> - Will try to stage a changed file for commit. Can use git add . to grab all unstaged files.

git push <remote name> <local branch name> - Will try to push changes of the local branch to a remote branch of the same name, or create a new remote branch with the same name.

git commit - Will commit the staged changes. Will open an editor (usually vim) for you to add the commit message. If you're committing with just a one-line message, use git commit -m "<your message>" (use the quotes).

git commit --amend - Will amend the last commit with staged changes, if any. You can modify just the commit message this way as well by using the command with no staged changes.

git push <remote name> +<local branch name> - Will absolutely push changes of the local branch to a remote branch of the same name, or create a new remote branch with the same name. If the local and remote branches differ, the local branch will overwrite the remote branch.

git rebase <branch name> - Will rebase the commits of the current local branch atop the commits of the specified branch. Could combine with git rebase <remote name> <branch name>.

git rebase -i <commit hash> - Will rebase the local branch onto the commit hash, allowing for squashes, dropping, rewording, etc. of commits.

git log - Will display the git commits for the local branch. Will show where other branch history may be, like that of master, if the branch is also on the local machine.

git branch - Will display all local branches.

git checkout <branch name> - Will try to switch to a local branch of the given name.

git checkout -b <branch name> - Will checkout a new branch that is a copy of the local branch the command is executed in.

git reflog - Will display all executed git commands, with associated hashes, since the repository was checked out.

git branch -D <local branch name> - Will delete the local branch. You must not have the branch checked out to delete it (meaning, switch to another branch because you can't delete the one you're currently on)

git remote -v - Will display the remote repository addresses. Useful if you forgot the name of your remote.