git checkout and merge in one command

Question

Is there a way to say this more concisely?

git checkout master
git merge branch

What I actually want to do much of the time is:

git rebase master branch
git checkout master
git merge branch

Answer https://stackoverflow.com/a/12343727/313842 sort of touched on this but leaves branch checkout out. git merge in one command is also a similar but different question.

Maybe you can create a script or symlink which bundles together some Git commands. — Tim Biegeleisen
– Tim Biegeleisen, Commented Jan 6, 2016 at 11:25
Sure I can write a script, or whatever. I just wanted to see if there was a way, which I had missed, to do it with a single command. — awy
– awy, Commented Jan 7, 2016 at 14:34
In the scenario you describe you can do git checkout -B master. It performs a reset instead of a (fast-forward) merge, but that's safe since you did a rebase master first. This solution is also mentioned in an alternative answer to the one you linked to. — lenz
– lenz, Commented May 30, 2016 at 19:28

Aakash · Accepted Answer · 2019-01-15 12:11:49Z

25

If your branch names are generally long, and you constantly merge the branch you just checkout from, you can use:

checking out from branch you want to merge

git checkout branch
git merge -

the '-' is shorthand for the previous branch, very handy for quick checking out and merging

edited Jan 15, 2019 at 12:11

Aakash

24.1k7 gold badges110 silver badges89 bronze badges

answered May 15, 2018 at 15:29

King

9722 gold badges11 silver badges20 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

CodeWizard · Accepted Answer · 2016-01-06 14:03:09Z

4

You have several options:

Script
Write a script which execute your commands
git alias
Write it in an alias or function inside your .gitconfig file

Use & operator

git checkout master && git merge branch & ... & ...

answered Jan 6, 2016 at 14:03

CodeWizard

146k22 gold badges162 silver badges181 bronze badges

2 Comments

HiTech Over a year ago

"Use & operator" I think you mean "Use && operator"

idbrii Over a year ago

The & operator is the Windows cmd.exe equivalent of ; in bash: you can run multiple commands in sequence regardless of whether the previous one failed. Use && between commands to only run if the previous command returned a 0 errorcode.

Collectives™ on Stack Overflow

git checkout and merge in one command

2 Answers 2

Comments

2 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

2 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related