# Merge *to* branch instead of merge *from* branch? 3 messages from 2008-04-26 to 2008-04-27. Participants: Peter Karlsson, Avery Pennarun, Kelvie Wong. Thread: https://gitlist.dev/t/13275 ## Peter Karlsson, 2008-04-26 22:42 Subject: Merge *to* branch instead of merge *from* branch? Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0804270037220.1149%40perkele.intern.softwolves.pp.se ``` 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. (My problem is not that I have to write two commands, the problem is that checking out master and then fast-forwarding it back to where I was is slow, working on a network-mapped share on Win32 as I am, and it causes the ancient compiler I'm using to re-compile nearly everything, which is also slow). -- \\// Peter - http://www.softwolves.pp.se/ ``` ## Avery Pennarun, 2008-04-26 23:17 Subject: Re: Merge *to* branch instead of merge *from* branch? Message-ID: <32541b130804261617y1fb2a8d9jf8fc6f58ca07b44f@mail.gmail.com> URL: https://gitlist.dev/e/32541b130804261617y1fb2a8d9jf8fc6f58ca07b44f%40mail.gmail.com In-Reply-To: ``` On 4/26/08, Peter Karlsson wrote: > 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. How about this? git merge master git branch -D master git branch master HEAD In other words, just make a copy of your current branch after merging and call it the new 'master'. That's all fast forwarding would do anyhow. Have fun, Avery ``` ## Kelvie Wong, 2008-04-27 02:19 Subject: Re: Merge *to* branch instead of merge *from* branch? Message-ID: <94ccbe710804261919u5aa5406cnd26f2eb4ff44990a@mail.gmail.com> URL: https://gitlist.dev/e/94ccbe710804261919u5aa5406cnd26f2eb4ff44990a%40mail.gmail.com In-Reply-To: ``` On Sat, Apr 26, 2008 at 3:42 PM, Peter Karlsson wrote: > 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 ```