From 6c2f673daf8da42f601ecb30ac15b2b1b227d5ca Mon Sep 17 00:00:00 2001
From: Kaiqi <kaiqi@kth.se>
Date: Sat, 27 Jul 2019 17:25:23 +0200
Subject: [PATCH 1/3] Have same name for fulltrace

---
 AUTHORS                 | 1 +
 src/_pytest/terminal.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 8e545e126..ad7bf4a1c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -132,6 +132,7 @@ Joseph Hunkeler
 Joshua Bronson
 Jurko Gospodnetić
 Justyna Janczyszyn
+Kaiqi Dong
 Kale Kundert
 Katarzyna Jachim
 Katerina Koukiou
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
index bcd6e1f7c..125f3604c 100644
--- a/src/_pytest/terminal.py
+++ b/src/_pytest/terminal.py
@@ -114,7 +114,7 @@ def pytest_addoption(parser):
     )
     group._addoption(
         "--fulltrace",
-        "--full-trace",
+        "--fulltrace",
         action="store_true",
         default=False,
         help="don't cut any tracebacks (default is to cut).",

From 958374addbbbb8b700b5fe8b7fb8afd7534691e3 Mon Sep 17 00:00:00 2001
From: Kaiqi <kaiqi@kth.se>
Date: Sat, 27 Jul 2019 17:26:52 +0200
Subject: [PATCH 2/3] Remove name from author

---
 AUTHORS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index ad7bf4a1c..8e545e126 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -132,7 +132,6 @@ Joseph Hunkeler
 Joshua Bronson
 Jurko Gospodnetić
 Justyna Janczyszyn
-Kaiqi Dong
 Kale Kundert
 Katarzyna Jachim
 Katerina Koukiou

From aa13c625da602bc6744c68fcb8606d328b327e55 Mon Sep 17 00:00:00 2001
From: Kaiqi <kaiqi@kth.se>
Date: Sat, 27 Jul 2019 21:06:29 +0200
Subject: [PATCH 3/3] Change the warning message

---
 src/_pytest/terminal.py  | 4 ++--
 testing/test_terminal.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
index 125f3604c..05d5427c3 100644
--- a/src/_pytest/terminal.py
+++ b/src/_pytest/terminal.py
@@ -114,7 +114,7 @@ def pytest_addoption(parser):
     )
     group._addoption(
         "--fulltrace",
-        "--fulltrace",
+        "--full-trace",
         action="store_true",
         default=False,
         help="don't cut any tracebacks (default is to cut).",
@@ -692,7 +692,7 @@ class TerminalReporter:
             else:
                 excrepr.reprcrash.toterminal(self._tw)
                 self._tw.line(
-                    "(to show a full traceback on KeyboardInterrupt use --fulltrace)",
+                    "(to show a full traceback on KeyboardInterrupt use --full-trace)",
                     yellow=True,
                 )
 
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
index bf029fbc5..381a5b2e1 100644
--- a/testing/test_terminal.py
+++ b/testing/test_terminal.py
@@ -233,7 +233,7 @@ class TestTerminal:
             )
         else:
             result.stdout.fnmatch_lines(
-                ["(to show a full traceback on KeyboardInterrupt use --fulltrace)"]
+                ["(to show a full traceback on KeyboardInterrupt use --full-trace)"]
             )
         result.stdout.fnmatch_lines(["*KeyboardInterrupt*"])