Switch-and-merge as a single command

By Arioch... on August 20, 2013 15:53 (imported from Google Code)

---

Imagine i made a small change in some short-span tree, like fixing a bug.

Now i want to switch back to master and merge changes from that branch.

I wish there be a way in TortoiseGit and git to do it "with single click".

Separately switching to master and after that merging from old branch (what was its name?) - both times scrolling and searching the branch's name from a long list - seems to be a bit too
much "boilerplate" activity.