summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-write-tree.txt3
-rwxr-xr-xgit-merge-one-file-script7
-rw-r--r--write-tree.c4
3 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index 7f076b4..3b6a66f 100644
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -9,8 +9,7 @@ git-write-tree - Creates a tree from the current cache
SYNOPSIS
--------
-'git-write-tree'
- [--missing-ok]
+'git-write-tree' [--missing-ok]
DESCRIPTION
-----------
diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 9802f67..be64c07 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -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=$?
diff --git a/write-tree.c b/write-tree.c
index 561a101..2b2c6b7 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -89,14 +89,14 @@ int main(int argc, char **argv)
int entries = read_cache();
unsigned char sha1[20];
- if (argc==2) {
+ if (argc == 2) {
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;
else
die("unknown option %s", argv[1]);
}
- if (argc>2)
+ if (argc > 2)
die("too many options");
if (entries < 0)