Git

• Git Internals
  • Git Objects
• Appendix A: Git in Other Environments - Git in Bash
  • includes information on customizing your Bash prompt (PS1) to show information about the current directory’s Git repository
• git_cheat_sheet.md
• How to undo (almost) anything with Git
• On undoing, fixing, or removing commits in git
• A Visual Git Reference (clipped: A Visual Git Reference) -beginnerfriendly
• git - the simple guide - just a simple guide for getting started with git. no deep shit ;) by Roger Dudler -beginnerfriendly
• Oh Shit, Git!?!
• Git Cheatsheet
• Atlassian Advanced Git tutorials
  • Git Refs What You Need to Know Atlassian Git Tutorial
• Advanced Git Tutorial - Interactive Rebase, Cherry-Picking, Reflog, Submodules and more from freeCodeCamp.org
• How to Undo Mistakes With Git Using the Command Line from freeCodeCamp.org
  • saved this mainly because there is an explanation of interactive rebase (timestamped)
• pre-commit - A framework for managing and maintaining multi-language pre-commit hooks
• Understanding Git commit SHAs
  • Why does Git use a cryptographic hash function?

Separating a subdirectory out into a separate repo

See 👉 Splitting a subfolder out into a new repository - GitHub Docs which uses git-filter-repo

Difference between double and triple dot in git diff and git log

See Double-Dot “..” vs. Triple-Dot “…” in Git Commit Ranges Baeldung on Ops

Summary of what using dots notation means for git diff and git log:

Command	Descriptions
$ git log branch1..branch2	displays the commits that are in branch2 but not in branch1 (main)
$ git log branch1…branch2	shows the commits that are included in either branch1 or branch2, but not both
$ git diff branch1..branch2	shows the full differences between any two commits of branch1 and branch2
$ git diff branch1…branch2	displays the differences between the common ancestor of both branches and another branch

Moreover, we use these notations to compare different sets of commits, which is useful for many Git operations.

Git Reflog

This section is llm-generated

git reflog is a built-in Git command that records the history of references, such as commits, branch creations, branch deletions, and other updates. It serves as a safety net, allowing you to recover lost or deleted commits and branches even when they are no longer visible in regular Git logs Source 2.

By default, git reflog outputs the reflog of the HEAD reference, which is considered to be an iconic reference to the branch that is currently active. You can access a git ref by using the name@{qualifier} syntax. For example, to get the entire reflog of all the references, you can execute git reflog show --all Source 0.

There are several subcommands of git reflog that provide additional functionality:

• git reflog show: This subcommand is an alias for git log -g --abbrev-commit --pretty=oneline. It displays a chronological list of reflog entries for the current branch, highlighting the commit hashes, actions, and timestamps Source 0.

• git reflog expire: This subcommand is used for cleaning old or unapproachable reflog entries. The danger of this subcommand is the possibility of data loss. In fact, the expire subcommand is not used by users. It is used only by the Git. By default, the reflog date of expiry is set to 90 days. Pass --expire=time argument to git reflog expire for specifying an expire time Source 0.

• git reflog delete: This subcommand is designed for deleting passed reflog entries. However, the end users avoid executing this subcommand, because, as in the case of git reflog expire, there is a risk of data loss Source 0.

The reflog is a powerful tool for maintaining a safety net in your Git repository and recovering from various accidental or unexpected changes, such as those times when you need to recover lost commits or branches and have lost track of your Git history Source 5.

For example, if you accidentally reset or delete a branch, the reflog keeps a record of the previous state, including commit hashes. You can use git reflog to find and recover a lost commit by examining its entries Source 2.

Here is a basic example of how to use git reflog:

# Show the reflog for the current branch
git reflog
 
# Show the reflog for a specific branch
git reflog show test_branch
 
# Show the reflog for a git stash
git reflog stash
 
# Use a reflog entry to checkout a previous state
git checkout HEAD@{1}

Remember that git reflog is a local command and its entries are not pushed to remote repositories by default. It is a useful tool that can be used in DevOps workflows Source 2.