git create new branch with remote tracking

Git create new branch with remote tracking update#

This means that if you use a vanilla git rebase that removes that commit from the branch's history, your branch and its children may suddenly become untracked! In order to bring the branch back into Graphite, you will need to ensure the branch is correctly based on its parent, and then use gt branch track to fix its metadata. the commit in its history that corresponds to its parent branch. The CLI's engine keeps track of the base of each branch - i.e. Option -r causes the remote-tracking branches to be listed, and option -a shows both local and remote branches. Note that this will also result in all descendants of this branch becoming untracked as well to avoid this, use upstack onto to move them onto a new parent first (learn more about upstack onto here). There is also a gt branch untrack command that you can use to stop tracking a branch without deleting it from git. The -force flag chooses the nearest ancestor of each branch as its parent. Run it from the tip of a stack to track the entire thing by selecting the parent of each branch until you reach a branch that is already tracked. What if you've created a stack of multiple branches outside of Graphite? gt downstack track allows you to track multiple branches recursively. Gt branch track can also be used to fix Graphite metadata if it ever becomes corrupted or invalid due to a Graphite bug or other issue. When run, it prompts you to select a parent for the current branch from the branch's Git history. Tracking branches created outside of Graphite If you use git instead of gt to create a branch, you need to let gt know what its parent is. We specify simple here because there is some nuance to using git rebase - see below for details.

Git create new branch with remote tracking update#

Also potentially dangerous (see further below).īecause of the 'restacking' model, it is always safe to update your branches with simple git commands as a gt upstack restack on each child will rebase descendants such that they have the new version in their history. Git rebase: Useful for preparing branches created outside of Graphite to be tracked (see below).

Git status: Keep track of your worktree and staging area, just like git The first one, git branch , is used to create a new branch based on the currently checked out (HEAD) branch, meaning that if you. git create new branch with remote tracking

Git diff: See what has changed between two branches. Since restacking requires the working tree to be clean, stashing changes you don't intend to commit is often necessary while using gt. Git stash: Save changes for later (retrieve with git stash pop). Git add: Stage files to be committed -p is helpful for precise cases. Git commands that Graphite users may find useful: git - you can (and should) use gt for everything! For commands like gt branch which differ from their git equivalents, we recommend using the gt version. Git passthrough helps to avoid confusion about when to use gt vs.