k88hudson/git-flight-rules

Maintainer? Show your league in your README

Card: your league's emblem, from Copper to Legendary

[![bestofgithub](https://bestofgithub.dev/badge/k88hudson/git-flight-rules.svg?style=card)](https://bestofgithub.dev/repo/k88hudson/git-flight-rules)

Flat: fits beside your other badges

[![bestofgithub](https://bestofgithub.dev/badge/k88hudson/git-flight-rules.svg)](https://bestofgithub.dev/repo/k88hudson/git-flight-rules)

Loading README…

Flight rules for Git

What are "flight rules"?

Conventions for this document

Repositories

I want to start a local repository

I want to clone a remote repository

I set the wrong remote repository

I want to add code to someone else's repository

Suggesting code via pull requests

Suggesting code via patches

I need to update my fork with latest updates from the original repository

Editing Commits

What did I just commit?

I wrote the wrong thing in a commit message

I committed with the wrong name and email configured

I want to remove a file from the previous commit

I want to move a change from one commit to another

I want to delete or remove my last commit

Delete/remove arbitrary commit

I tried to push my amended commit to a remote, but I got an error message

I accidentally did a hard reset, and I want my changes back

I accidentally committed and pushed a merge

I accidentally committed and pushed files containing sensitive data

I want to remove a large file from ever existing in repo history

Recommended Technique: Use third-party bfg

Built-in Technique: Use git-filter-branch

Final Step: Pushing your changed repo history

I need to change the content of a commit which is not my last

Staging

I want to stage all tracked files and leave untracked files

To stage part of tracked files

I want to stage all untracked files and leave tracked files

I need to add staged changes to the previous commit

I want to stage part of a new file, but not the whole file

I want to add changes in one file to two different commits

I staged too many edits, and I want to break them out into a separate commit

I want to stage my unstaged edits, and unstage my staged edits

I want to unstage a specific staged file

I want to choose which entire files to stage

Discarding changes

I want to discard my local uncommitted changes (staged and unstaged)

I want to discard specific unstaged changes

I want to discard specific unstaged files

I want to discard only my unstaged local changes

I want to discard all of my untracked files

Branches

I want to list all branches

Create a branch from a commit

I pulled from/into the wrong branch

I want to discard local commits so my branch is the same as one on the server

I want to move my unstaged edits to a new branch

I want to move my unstaged edits to a different, existing branch

I committed to main instead of a new branch

I want to keep the whole file from another ref-ish

I made several commits on a single branch that should be on different branches

I want to delete local branches that were deleted upstream

I accidentally deleted my branch

I want to delete a branch

I want to delete multiple branches

I want to rename a branch

I want to checkout to a remote branch that someone else is working on

I want to create a new remote branch from current local one

I want to set a remote branch as the upstream for a local branch

I want to set my HEAD to track the default remote branch

I made changes on the wrong branch

I want to split a branch into two

Rebasing and Merging

I want to undo rebase/merge

I rebased, but I don't want to force push

I need to combine commits

Safe merging strategy

I need to merge a branch into a single commit

I want to combine only unpushed commits

I need to abort the merge

I need to update the parent commit of my branch

Check if all commits on a branch are merged

Possible issues with interactive rebases

The rebase editing screen says 'noop'

There were conflicts

Stash