]> git.e2factory.org Git - e2factory.git/commit
Overhaul git.update() making use of the work in generic_git
authorTobias Ulmer <tu@emlix.com>
Tue, 5 Nov 2013 19:21:25 +0000 (20:21 +0100)
committerTobias Ulmer <tu@emlix.com>
Wed, 16 Nov 2016 14:41:16 +0000 (15:41 +0100)
commitc4bcaca05adfd95f3ac41d0a3c7ddc8cca815812
tree9d20b6e982304039452c47fdf3b8ad58994176be
parent239f8ed6010828ca0dd15665800bdc9f779c15c0
Overhaul git.update() making use of the work in generic_git

Update does not create merge commits any more. This change requires a
git version supporting git merge --ff-only. Tested with version 1.6.6.

Signed-off-by: Tobias Ulmer <tu@emlix.com>
plugins/git.lua