diff options
| author | Thomas Koutcher <thomas.koutcher@online.fr> | 2022-02-01 18:26:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-01 11:31:51 -0800 |
| commit | 9158a3564a970def3375a79e8f3f90927cd8e793 (patch) | |
| tree | 8405cbc4d06a4970c3dd4737368603c783989d42 /gitweb/static/js/lib/cookies.js | |
| parent | 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a (diff) | |
subtree: force merge commit
When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will
fail with error `fatal: Not possible to fast-forward, aborting.`, but
the command does want to make merges in these places. Add `--no-ff`
argument to `git merge` to enforce this behaviour.
Signed-off-by: Thomas Koutcher <thomas.koutcher@online.fr>
Reviewed-by: Johannes Altmanninger <aclopte@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb/static/js/lib/cookies.js')
0 files changed, 0 insertions, 0 deletions