Philip Jackson <[email protected]> writes: >> Merge: >> >> m m Merge, no commit >> m c Merge & commit >> m f Merge, --ff-only >> m N Merge, --no-ff >> m s Squash > > Are these 'actions'?
Yes. >> Options: --no-commit, --ff, --no-ff, --log, --squash, --ff-only, >> --stragegy=, --strategy-option= > > So what would 'm N' do if you also set the option --ff? What does git? Fail? Carry on using the last option as the effective one? As key-groups allows to pick any arbitrary set of options for a given action, there is plenty of room for nonsensical combinations. There is no way for magit to figure out which of those combinations are wrong, so the Right Thing (TM) is to simply pass them to the git process. >> Is *magit-key* easily user-extensible? > > Erm... the buffer name or the entire feature? I mean adding and changing actions/options and key bindings.
