utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

@spacewander review.

Browse source
This commit is contained in:
Rémy HUBSCHER 2020-03-20 09:20:42 +01:00
parent 2a5c08aaf8
commit 2c9b071fde
No known key found for this signature in database
GPG key ID: A500E24B95405094
6 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Commands.md
View file

@ -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

2
bin/git-cp
View file

@ -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 ]]

2
bin/git-psykorebase
View file

@ -1,4 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail
PROGRAM=$0
PRIMARY_BRANCH=""
SECONDARY_BRANCH=""

2
man/git-cp.1
View file

@ -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

2
man/git-cp.html
View file

@ -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>

2
man/git-cp.md
View file

@ -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