Re: Merge *to* branch instead of merge *from* branch?
On Sat, Apr 26, 2008 at 3:42 PM, Peter Karlsson <peter@softwolves.pp.se> wrote:
Show 17 quoted lines
> Hi!
>
> My most common use-case of Git is currently somewhere along the lines of
>
> git checkout master # start from here
> git checkout -b new_branch
> ...edit...
> ...commit...
> git merge master # to make sure I have the latest changes
> ...make sure it all works...
> git checkout master
> git merge new_branch # fast-forwards master to new_branch's HEAD
>
> Is there any way of not having to do the "git checkout master" first?
> Basically I want a flag to merge or checkout saying that I want to merge my
> branch into the branch I'm switching to. I can't seem to find any such flag.
>
I believe what you are looking for is in in the "push" command.
git push . new_branch:master # pushes your changes into master.
--
Kelvie Wong