Aptana: Git merge without fast forward

问题

how can i disable fast-forward for mergining branches in aptana 3 ?

example:

1. create/checkout a branch (foo)
2. commit changes
3. checkout master-branch
4. merge with foo

回答1:

Set it in project repository configuration

git config --add merge.ff false

回答2:

I think the nearest you get is to use merge --no-ff.

来源：https://stackoverflow.com/questions/9159895/aptana-git-merge-without-fast-forward