I work on a project that has 2 branches, A and B. I typically work on branch A, and merge stuff from branch B. For the merging, I would typically do:
git mer
Enter git-forward-merge:
Without needing to checkout destination, git-forward-merge merges source into destination branch.
git-forward-merge
https://github.com/schuyler1d/git-forward-merge
Only works for automatic merges, if there are conflicts you need to use the regular merge.