merging in the gui should honer the no-ff setting

[astubbs]

[astubbs]

hmm, perhaps there isn't one :/ http://www.reddit.com/r/programming/comments/a9m2n/real_world_git_from_a_twitter_dev/.mobile

[brotherbard]

--no-ff is currently a command line option only.

[astubbs]

doh, can it be added to gitx preferences?

[brotherbard]

It could.

[astubbs]

great :)

[fabb]

is this feature still planned? i need it very often as we use the git branching model at http://nvie.com/posts/a-successful-git-branching-model/

[felixyz]

Not an argument to not fix this, but: I used to always merge with --no-ff, but realized the extra information is not worth the downsides, especially making it harder to track down bugs with git bisect. A good post on this topic: http://darwinweb.net/articles/the-case-for-git-rebase