projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Find size of SHA1 object without inflating everything.
[git.git]
/
git-resolve-script
diff --git
a/git-resolve-script
b/git-resolve-script
index
5f1a748
..
b7ccc20
100644
(file)
--- a/
git-resolve-script
+++ b/
git-resolve-script
@@
-41,7
+41,7
@@
if [ "$common" == "$head" ]; then
sleep 3
git-read-tree -m $merge && git-checkout-cache -f -u -a
echo $merge > "$GIT_DIR"/HEAD
sleep 3
git-read-tree -m $merge && git-checkout-cache -f -u -a
echo $merge > "$GIT_DIR"/HEAD
- git-diff-tree -p ORIG_HEAD HEAD |
diffstat -p1
+ git-diff-tree -p ORIG_HEAD HEAD |
git-apply --stat
exit 0
fi
echo "Trying to merge $merge into $head"
exit 0
fi
echo "Trying to merge $merge into $head"
@@
-58,4
+58,4
@@
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me
echo "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD
git-checkout-cache -f -u -a
echo "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD
git-checkout-cache -f -u -a
-git-diff-tree -p ORIG_HEAD HEAD |
diffstat -p1
+git-diff-tree -p ORIG_HEAD HEAD |
git-apply --stat