@mschneiderwind review.

This commit is contained in:
Rémy HUBSCHER 2020-03-19 16:11:39 +01:00
parent 739ca052b4
commit bea25d1ceb
No known key found for this signature in database
GPG key ID: A500E24B95405094

View file

@ -3,16 +3,12 @@ PROGRAM=$0
CURRENT_FILENAME=""
DESTINATION_FILENAME=""
function current_branch() {
git rev-parse --abbrev-ref HEAD
}
function usage()
{
echo "USAGE: ${PROGRAM} CURRENT_FILENAME DESTINATION_FILENAME"
}
while [[ $# > 0 ]]
while [[ $# -gt 0 ]]
do
key="$1"
@ -52,7 +48,7 @@ else
# We get back our copy
rm -f "${DESTINATION_FILENAME}" # Make sure the file doesn't exists somehow
git merge ${SAVED}
git merge "${SAVED}"
git commit -a -m "Duplicate ${CURRENT_FILENAME} history." # Keeping both files
# We get back our original name