git checkout -b foo
switches on foo
branch (even if it doesn't exist, it is created), but if the foo
branch already exists it throws an error like this:
fatal: A branch named 'foo' already exists.
What's the command that does the following check?
git checkout foo
)git checkout -b foo
)The command checkout -b creates a new branch and then checks out to that branch.
you can do git checkout -m <branch-name> to merge conflicts and checkout to the branch and resolve conflicts yourself, or git checkout -f <branch-name> to ignore changes.
The git branch command can be used to create a new branch. When you want to start a new feature, you create a new branch off main using git branch new_branch . Once created you can then use git checkout new_branch to switch to that branch.
First, make sure that the target branch exists by running the “git branch” command. Now that you made sure that your branch exists, you can switch from the master branch to the “feature” branch by executing the “git checkout” command. That's it!
Update Q3 2019 (Git 2.23): there now actually is a git switch
command!
git switch -c aBranch
You would need a similar alias though:
switchoc = "!f() { git switch $1 2>/dev/null || git switch -c $1; }; f"
Note the name of the alias: switchoc (for "switch or create").
As jar
pointed out in the comments:
Anyone trying this in 2021, note that you cannot shadow existing
git
commands with aliases.
Sincegit switch
is agit
command, this alias (named "switch
") won't work. You must create your unique name for the alias, like "switchit
" or something.
bgusach's alias mentioned below in the comment is safer (based on Jiří Pavelka 's answer):
switch = "!f() { git checkout $1 2>/dev/null || git checkout -b $1; }; f" git switch abranch
Original answer (2014) You can try:
git checkout -B foo
From git checkout
man page:
If
-B
is given,<new_branch>
is created if it doesn’t exist; otherwise, it is reset. This is the transactional equivalent of
$ git branch -f <branch> [<start point>] $ git checkout <branch>
As mentioned below, use it with caution as it does reset the branch, which is not always desirable.
If you did reset the branch by mistake with this command, you can easily revert to its previous state with:
git reset HEAD@{1}
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With