summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e35f982)
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>
-'git-write-tree'
- [--missing-ok]
+'git-write-tree' [--missing-ok]
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
- exec git-update-cache --remove -- "$4"
+ exec git-update-cache --remove -- "$4"
# We reset the index to the first branch, making
# git-diff-file useful
# 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=$?
git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
ret=$?
int entries = read_cache();
unsigned char sha1[20];
int entries = read_cache();
unsigned char sha1[20];
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;
else
die("unknown option %s", argv[1]);
}
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;
else
die("unknown option %s", argv[1]);
}
die("too many options");
if (entries < 0)
die("too many options");
if (entries < 0)