summaryrefslogtreecommitdiffstats
path: root/wiki/src/blueprint/l10n_Italian.mdwn
diff options
context:
space:
mode:
author127.0.0.1 <127.0.0.1@web>2017-07-20 15:22:06 +0200
committeramnesia <webmaster@amnesia.boum.org>2017-07-20 15:22:06 +0200
commit38981a3b652935e7dd8493e8dda2e88f311fb752 (patch)
tree09d9fe33ccc76f2166c93eaf25bcca1aad75e6b6 /wiki/src/blueprint/l10n_Italian.mdwn
parente6ecb65e653cab313416a70f4e26554b479c7458 (diff)
no squash
Diffstat (limited to 'wiki/src/blueprint/l10n_Italian.mdwn')
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 3c5719d..6317da3 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -230,7 +230,7 @@ Laura corregge e fa commit sulla stessa branch `git commit wiki/src/inferno/terz
Non trova altri errori, quindi fa
git checkout master
- git merge inferno
+ git merge --no-ff inferno
Potrebbe subito fare `git push origin master` ma, per non sbagliare, fa un diff: