mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Trivial tidyups

Browse Source 
Simple whitespace-related tidyups ensuring style consistency.

This is carried over from my old git-pb branch.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Petr Baudis
2005-07-29 11:00:45 +02:00
committed by Junio C Hamano
parent e35f982415
commit 0b124bb4bf
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-merge-one-file-script
View File

@ -22,11 +22,10 @@ case "${1:-.}${2:-.}${3:-.}" in
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
if test -f "$4"
then
if test -f "$4"; then
rm -f -- "$4"
fi &&
exec git-update-cache --remove -- "$4"
exec git-update-cache --remove -- "$4"
;;
#
@ -62,7 +61,7 @@ case "${1:-.}${2:-.}${3:-.}" in
# We reset the index to the first branch, making
# git-diff-file useful
git-update-cache --add --cacheinfo "$6" "$2" "$4"
git-update-cache --add --cacheinfo "$6" "$2" "$4"
git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
ret=$?