From 2c9b071fded8053ec1dd125d3539eaa264d4c929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <hubscher.remy@gmail.com>
Date: Fri, 20 Mar 2020 09:20:42 +0100
Subject: [PATCH] @spacewander review.

---
 Commands.md         | 2 +-
 bin/git-cp          | 2 +-
 bin/git-psykorebase | 2 ++
 man/git-cp.1        | 2 +-
 man/git-cp.html     | 2 +-
 man/git-cp.md       | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Commands.md b/Commands.md
index b18f5a4..3361295 100644
--- a/Commands.md
+++ b/Commands.md
@@ -789,7 +789,7 @@ $ git info --no-config
 
 ## git cp
 
-Copy a file to another one keeping its history and allowing for merge conflits handling.
+Copy a file to another one keeping its history and allowing for merge conflicts handling.
 
 ```bash
 $ git cp README.md README.rst
diff --git a/bin/git-cp b/bin/git-cp
index 3120225..4c6f7d2 100755
--- a/bin/git-cp
+++ b/bin/git-cp
@@ -5,7 +5,7 @@ DESTINATION_FILENAME=""
 
 function usage()
 {
-    echo "USAGE: ${PROGRAM} CURRENT_FILENAME DESTINATION_FILENAME"
+    echo 1>&2 "USAGE: ${PROGRAM} CURRENT_FILENAME DESTINATION_FILENAME"
 }
 
 while [[ $# -gt 0 ]]
diff --git a/bin/git-psykorebase b/bin/git-psykorebase
index e0ebaa3..995ad92 100755
--- a/bin/git-psykorebase
+++ b/bin/git-psykorebase
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -euo pipefail
+
 PROGRAM=$0
 PRIMARY_BRANCH=""
 SECONDARY_BRANCH=""
diff --git a/man/git-cp.1 b/man/git-cp.1
index 3b64eac..d9a1709 100644
--- a/man/git-cp.1
+++ b/man/git-cp.1
@@ -6,7 +6,7 @@
 .SH "SYNOPSIS"
 \fBgit\-cp\fR <current_filename> <destination_filename>
 .SH "DESCRIPTION"
-Copy a file keeping its git history\. This allow merge conflict handling\.
+Copy a file keeping its git history\. This allows merge conflict handling\.
 .SH "EXAMPLES"
 Copy README into README\.txt
 .IP "" 4
diff --git a/man/git-cp.html b/man/git-cp.html
index a04df9e..b670f7b 100644
--- a/man/git-cp.html
+++ b/man/git-cp.html
@@ -80,7 +80,7 @@
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>Copy a file keeping its git history. This allow merge conflict handling.</p>
+<p>Copy a file keeping its git history. This allows merge conflict handling.</p>
 
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
diff --git a/man/git-cp.md b/man/git-cp.md
index ed05fe8..9e333d2 100644
--- a/man/git-cp.md
+++ b/man/git-cp.md
@@ -7,7 +7,7 @@ git-cp(1) -- Copy a file keeping its history
 
 ## DESCRIPTION
 
-Copy a file keeping its git history. This allow merge conflict handling.
+Copy a file keeping its git history. This allows merge conflict handling.
 
 ## EXAMPLES