kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Show usage string for 'git merge-one-file -h' 

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Nieder 2009-11-09 09:04:53 -06:00 committed by Junio C Hamano
parent aa481d38b0
commit ae5bdda36c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-merge-one-file.sh
View File

@ -16,6 +16,18 @@
# been handled already by git read-tree, but that one doesn't # been handled already by git read-tree, but that one doesn't
# do any merges that might change the tree layout. # do any merges that might change the tree layout.


USAGE='<orig blob> <our blob> <their blob> <path>'
USAGE="$USAGE <orig mode> <our mode> <their mode>"
LONG_USAGE="Usage: git merge-one-file $USAGE

Blob ids and modes should be empty for missing files."

if ! test "$#" -eq 7
then
echo "$LONG_USAGE"
exit 1
fi

case "${1:-.}${2:-.}${3:-.}" in case "${1:-.}${2:-.}${3:-.}" in
# #
# Deleted in both or deleted in one and unchanged in the other # Deleted in both or deleted in one and unchanged in the other