Essential Git

Getting started
- Getting started with Git
- Create your first repository then add and commit files
- Clone a repository
- Sharing code
- Setting your user name and email
- Setting up the upstream remote
- Learning about a command
- Set up SSH for Git
- Git Installation
Committing
- Stage and commit changes
- Good commit messages
- Amending a commit
- Committing without opening an editor
- Commit changes directly
- Create an empty commit
- Commit on behalf of someone else
- Selecting which lines should be staged for committing
- Commiting changes in specific files
- Sign commits with GPG
- Commit at a specific date
- Amend the time of a commit
- Amending the author of a commit
Browsing the history
- Regular git log
- Prettier log
- One line log
- Colorize logs
- Log search
- List all contributions grouped by author name
- Searching commit string in git log
- Filter logs
- Log for a range of lines within a file
- Log with changes inline
- Git Log Between Two Branches
- Log showing commited files
- Show the contents of a single commit
- One line showing commiter name and time since commit
Undoing
- Undo changes in working copy or index
- Return to a previous commit
- Revert existing commits
- Undo merges
- Using reflog
- Undo / redo a series of commits
Staging
- Staging all changes to files
- Unstage a file that contains changes
- Add changes by hunk
- Interactive add
- Show staged changes
- Staging a single file
- Stage deleted files
Git diff
- Show differences in working branch
- Show changes between two commits
- Show differences for staged files
- Compare branches
- Show both staged and unstaged changes
- Show differences for a specific file or directory
- Viewing a word-diff for long lines
- Show difference between two commits or branches
- Show differences between current version and last version
- Produce a diff compatible with patch command
- Using meld to see all modifications in the working directory
- Diff UTF-16 encoded text and binary plist files
- Show changes between two branches
- View a three-way merge including the common ancestor
Merging
- Automatic merging
- Merge one branch into another
- Aborting a merge
- Keep changes from only one side of a merge
- Merge with a commit
- Finding all branches with no merged changes
Ignoring files and folders
- Checking if a file is ignored
- Exceptions in a .gitignore file
- A global .gitignore file
- Ignore files already committed to a git repository
- Ignore files locally without committing ignore rules
- Ignore a file in any directory
- Ignoring subsequent changes to a file without removing it
- Ignoring files in subfolders, multiple .gitignore files
- Prefilled .gitignore Templates
- Create an empty folder
- Find files ignored by .gitignore
- Ignore only part of a file stub
- Ignore changes in tracked files. stub
- Clear already committed files but included in .gitignore
Working with remotes
- Adding a new remote repository
- Updating from upstream repository
- Updating with local changes
- Deleting a remote branch
- Changing remote URL
- List existing remotes
- Pull overwrite local
- Removing local copies of deleted remote branches
- Pull code from remote
- Set upstream on a hew branch
- Get the URL for a specific remote
- Set the URL for a specific remote
- Show information about a specific remote
- Pull permission denied
- Renaming a remote
- Changing a remote repository
- ls-remote to query remote without fetch
Submodules
- Clone a git repository having submodules
- Updating a submodule
- Adding a submodule
- Setting a submodule to follow a branch
- Moving a submodule
- Removing a submodule
Aliases
- List search existing aliases
- Advanced aliases
- Temporarily ignore tracked files
- Show pretty log with branch graph
- Update code while keeping a linear history
- See which files are being ignored by your .gitignore configuration
- Unstage staged files
Rebasing
- Rebase local branch
- Rebase ours and theirs local and remote
- Interactive rebase
- Rebase down to the initial commit
- Configure autostash
- Rebase before a code review
- Test all commits during rebase
- Setup git-pull for automatically perform a rebase instead of a merge
- Abort an interactive rebase
- Pushing after a rebase
Configuration
- Auto correct typos
- Setting which editor to use
- Multiple git configurations
- Username and email address
- List and edit the current configuration
- Multiple usernames and email address
- Configuring line endings
- configuration for one command only
- Setup a proxy
Branching
- Creating and checking out new branches
- Listing branches
- Delete a remote branch
- Quick switch to the previous branch
- Check out a new branch tracking a remote branch
- Delete a branch locally
- Create an orphan branch i.e. branch with no parent commit
- Rename a branch
- Searching in branches
- Push branch to remote
- Move current branch HEAD to an arbitrary commit
- Overwrite single file in current working directory with the same from another branch
rev-list
Squashing
- Squash Recent Commits Without Rebasing
- Squashing commits during a rebase
- Squashing commit during a merge
- Autosquash - committing code you want to squash during a rebase
- Autosquashing and fixups
Cherry picking
- Copying a commit from one branch to another
- Copying a range of commits from one branch to another
- Checking if a cherry-pick is required
- Find commits yet to be applied to upstream
Recovering
git clean
.gitattributes
- Using a .gitattributes file
- Automatic Line Ending Normalization
- Identify Binary Files
- Disable Line Ending Normalization
- Prefilled .gitattribute Templates
.mailmap
- .mailmap file Associating contributor and email aliases
- Merge contributers by aliases to show commit count in shortlog.
Different workflows
- Analyzing types of workflows
- Centralized Workflow
- Gitflow Workflow
- Feature Branch Workflow
- GitHub Flow
- Forking Workflow
Pulling
- Pulling
- Pulling changes to a local repository
- Updating with local changes
- Pull overwrite local
- Pull code from remote
- Keeping linear history when pulling
- Pull permission denied
Hooks
- Hooks
- Automatically forward certain pushes to other repositories
- Verify Maven build or other build system before committing
- Pre-push
- Prepare-commit-msg
- Post-receive
- Pre-commit
- Post-commit
- Pre-rebase
- Pre-receive
- Update
- Post-checkout
- Local hooks
- Commit-msg
Cloning repositories
- Cloning Repositories
- Shallow Clone
- Regular Clone
- Clone a specific branch
- Clone recursively
- Clone using a proxy
Stashing
- Stashing
- What is Stashing
- Create stash
- Apply and remove stash
- Apply stash without removing it
- Show stash
- Partial stash
- List saved stashes
- Move your work in progress to another branch
- Remove stash
- Apply part of a stash with checkout
- Recovering earlier changes from stash
- Interactive Stashing
- Recover a dropped stash
Subtrees
- Subtrees
- Create Pull and Backport Subtree
Renaming
- Renaming
- Rename Folders
- Renaming a local branch
- rename a local and the remote branch
Pushing
- Pushing
- Push a specific object to a remote branch
- Push
- Force Pushing
- Push tags
- Changing the default push behavior
Internals
- Internals
- Repo
- Objects
- HEAD ref
- Refs
- Commit Object
- Tree Object
- Blob Object
- Creating new Commits
- Moving HEAD
- Moving refs around
- Creating new Refs
git-tfs
- git-tfs
- git-tfs clone
- git-tfs clone from bare git repository
- git-tfs install via Chocolatey
- git-tfs Check In
- git-tfs push
Empty directories in git
- Empty directories in Git
- Git doesnt track directories
git-svn
- git-svn
- Cloning the SVN repository
- Pushing local changes to SVN
- Working locally
- Getting the latest changes from SVN
- Handling empty folders
Archive
- Archive
- Create an archive of git repository
- Create an archive of git repository with directory prefix
- Create archive of git repository based on specific branch revision tag or directory
Rewriting history with filter-branc
- Rewriting history with filter-branch
- Changing the author of commits
- Setting git committer equal to commit author
Migrating to git
- Migrating to Git
- SubGit
- Migrate from SVN to Git using Atlassian conversion utility
- Migrate from Team Foundation Version Control TFVC to Git
- Migrating Mercurial to Git
- Migrate from SVN to Git using svn2git
Show
- Show
- Overview
Resolving merge conflicts
- Resolving merge conflicts
- Manual Resolution
Bundles
- Bundles
- Creating a git bundle on the local machine and using it on another
Display commit history graphically with gitk
- Display commit history graphically with Gitk
- Display commit history for one file
- Display all commits between two commits
- Display commits since version tag
Bisecting to find faulty commits
- BisectingFinding faulty commits
- Binary search git bisect
- Semi-automatically find a faulty commit
Blaming
- Blaming
- Only show certain lines
- To find out who changed a file
- Show the commit that last modified a line
- Ignore whitespace-only changes
Git revisions syntax
- Git revisions syntax
- Specifying revision by object name
- Symbolic ref names branches tags remote-tracking branches
- The default revision HEAD
- Reflog references refnamen
- Reflog references refnamedate
- Tracked upstream branch branchnameupstream
- Commit ancestry chain rev revn etc.
- Dereferencing branches and tags rev0 revtype
- Youngest matching commit revtext text
Worktrees
- Worktrees
- Using a worktree
- Moving a worktree
Git remote
- Git Remote
- Display Remote Repositories
- Change remote url of your Git repository
- Remove a Remote Repository
- Add a Remote Repository
- Changing Git Remote URL
- Show more information about remote repository
- Rename a Remote Repository
- Renaming a Remote
Git large file storage
- Git Large File Storage LFS
- Declare certain file types to store externally
- Install LFS
- Set LFS config for all clones
git patch
- Git Patch
- Creating a patch
- Applying patches
git statistics
- Git statistics
- Lines of code per developer
- Listing each branch and its last revisions date
- Commits per developer
- Commits per date
- Total number of commits in a branch
- List all commits in pretty format
- Find All Local Git Repositories on Computer
- Show the total number of commits per author
git send-email
- git send-email
- Use git send-email with Gmail
- Composing
- Sending patches by mail
git gui clients
- gitk and git-gui
- GitHub Desktop
- Git Kraken
- SourceTree
- Git Extensions
- SmartGit
reflog - restoring commits not shown in git log
- Reflog - Restoring commits not shown in git log
- Recovering from a bad rebase
TortoiseGit
- TortoiseGit
- Ignoring Files and Folders
- Branching
- Assume unchanged
- Squash commits
External merge and diff tools
- External merge and difftools
- Setting up Beyond Compare
- Setting up KDiff3 as merge tool
- Setting up KDiff3 as diff tool
- Setting up an IntelliJ IDE as merge tool Windows
- Setting up an IntelliJ IDE as diff tool Windows
Update object name in reference
- Update Object Name in Reference
- Update Object Name in Reference
Git branch name on Bash Ubuntu
- Git Branch Name on Bash Ubuntu
- Branch Name in terminal
Git client-side hooks
- Git Client-Side Hooks
- Git pre-push hook
- Installing a Hook
Git rerer
- Git rerere
- Enabling rerere
Change git repository name
- Change git repository name
- Change local setting
git tagging
- Git Tagging
- Listing all available tags
- Create and push tags in GIT
tidying up your local and remote repository
- Tidying up your local and remote repository
- Delete local branches that have been deleted on the remote
diff tree
- diff-tree
- See the files changed in a specific commit
- Usage
- Common diff options
Contributors

Contents