====== git command cheatsheet ======

===== unstage files (if you have "git add" the wrong file) =====

<code bash>
git restore --staged some.file
</code>

===== revert 1 or more local commits (not yet pushed) =====

<code bash>
$ git reset --soft HEAD~1

Unstaged changes after reset:
D	somefolder/somefile
M	somefolder/someother.file

</code>


===== revert to a previous commit (already pushed) =====

<code bash>
git reset --hard <commit>
</code>


===== git reset details =====

git reset [<options>] [<commit>]

  * [<commit>] is the commit identifier (hash or reference) to reset to.
  * [<options>] are optional flags that modify the behavior of the reset command. 

Some possible options:
<code>
--hard: Reset the repository to the specified commit and discard all changes in the working tree.

--soft: Reset the repository to the specified commit, but keep changes in the working tree.

--mixed (default): Reset the repository to the specified commit, but keep changes in the index (staging area).

--merge: Reset the repository to the specified commit and keep changes that have been made in the working tree.

--keep: Keep changes in both the working tree and the index (staging area).
</code>


===== Use git stash to move code between branches =====

A common use case that I use git stash for is when I make changes in the wrong branch that are bigger than just a few lines and thus not so easy to copy/paste into the next branch.

Here is how I do it:

<code>
git stash // stash your changes
git checkout feature_branch // Navigate to your feature branch (or create and checkout a new branch: git checkout -b feature_branch
git stash apply // apply the stashed changes
git add .
git commit -m "Your commit message here"
git stash drop // delete the stash in case yuo no longer need it
</code>


===== other common commands =====

  * ''git init'': Initialize a new Git repository.
  * ''git clone <repository_url>'': Clone an existing Git repository.
  * ''git add <file_or_directory>'': Stage changes to a file or directory for the next commit.
  * ''git reset <file_or_directory>'': Unstage changes to a file or directory.
  * ''git commit -m "<message>"'': Commit staged changes with a message.
  * ''git log'': Display the commit history of the repository.
  * ''git status'': Display the current status of the repository, including staged and unstaged changes.
  * ''git diff'': Display the difference between the current state and the last commit.
  * ''git checkout <branch_or_commit>'': Check out a different branch or commit.
  * ''git branch'': Display a list of local branches.
  * ''git branch <branch_name>'': Create a new branch.
  * ''git checkout -b <branch_name>'': Create and checkout a new branch.
  * ''git merge <branch_name>'': Merge changes from another branch into the current branch.
  * ''git rebase <branch_name>'': Rebase the current branch on top of another branch.
  * ''git fetch'': Download new changes from the remote repository.
  * ''git pull'': Fetch and merge changes from the remote repository.
  * ''git push'': Upload local changes to the remote repository.

===== .git/config =====

Random stuff one can use in their git config file: ~/somerepo/.git/config 

==== User details ====

<code>
[user]
  email = username@example.com
  name = username
</code>

You can add this manually, or use the cli commands to populate the file with this information, like so:

<code bash>
git config user.email "username@example.com"
git config user.name "username"
</code>

==== Aliases ====

Setting up some short-cut commands for frequently used commands

<code>
[alias]
  st = status
  ci = commit
  br = branch
  co = checkout
  df = diff
  lg = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  kama = log --graph --pretty=format:\"%h - %cr - %cN - %s - %b\" --all
  ls = ls-files
</code>


==== Formatting ====

Funky colors

<code>
[color]
  ui = auto
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
  whitespace = red reverse
[color "status"]
  added = yellow
  changed = green
  untracked = cyan
</code>