Why uses git fast-forward merging per default?

Posted by Florian Pilz on Stack Overflow See other posts from Stack Overflow or by Florian Pilz
Published on 2010-05-17T15:26:16Z Indexed on 2010/05/17 15:30 UTC
Read the original article Hit count: 342

Filed under:

git

|

fast-forward

|

merge

Coming from mercurial, I'm using branches to organize features. Naturally I want to see this work-flow in my history as well.

But I started my new project with git and finished a feature. After merging I realized that git used fast-forward and forgot about my branch. So to think into the future: I'm the only one working on this project. If I use the default approach of git (fast-forward merging) my history would result in one giant master branch.

I don't want this and can't see any good reason making this default. Maybe there are reasons, but what's so striking about it, that it has to be the default action?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about fast-forward

Why uses git fast-forward merging per default?

as seen on Stack Overflow - Search for 'Stack Overflow'
Coming from mercurial, I'm using branches to organize features. Naturally I want to see this work-flow in my history as well. But I started my new project with git and finished a feature. After merging I realized that git used fast-forward and forgot about my branch. So to think into the future:… >>> More
XNA MediaPlayer fastforward/rewind

as seen on Stack Overflow - Search for 'Stack Overflow'
Using XNA 4.0, I am currently playing songs from the user's PC/XBox360 using the following: Microsoft.Xna.Framework.Media.MediaPlayer.Play(Song song); I see that MediaPlayer has a static Property PlayPosition that, as I've researched, used to be a get/set property, but it has been updated… >>> More
Flash "Play" button doesn't play video unless you hit rewind or fast forward

as seen on Stack Overflow - Search for 'Stack Overflow'
So I had an IE issue with flash videos continuing to play even when their DIV's display property was set to none ( $('flashdiv').hide(); ) So I was able to solve this problem, by using .detach() and then reinserting the div. This worked great, however the problem now is that the "play" button doesn't… >>> More
How can I fast-forward a single git commit, programmatically?

as seen on Stack Overflow - Search for 'Stack Overflow'
I periodically get message from git that look like this: Your branch is behind the tracked remote branch 'local-master/master' by 3 commits, and can be fast-forwarded. I would like to be able to write commands in a shell script that can do the following: How can I tell if my current branch can… >>> More
Can I make fast forwarding be off by default in git?

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there's an --ff option would seem to imply that there's a way, but I can't seem to… >>> More