Aptana: Git merge without fast forward

Question

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

example:

score 5 · Answer 1 · answered Feb 15 '12 at 15:23

5

Set it in project repository configuration

git config --add merge.ff false

answered Feb 15 '12 at 15:23

ishi

Note that this might require a recent (1.7.6+) version of git. – madth3 Feb 16 '12 at 01:58
Thanks for the note, i forgot about this. – ishi Feb 22 '12 at 12:00

score 1 · Answer 2 · answered Feb 06 '12 at 16:31

1

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

answered Feb 06 '12 at 16:31

ams

1

and how can i use --no-ff in the aptana plugin ? – Nils Rückmann Feb 07 '12 at 10:25

2 Answers2