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

git-resolve-script: use "git-apply --stat" instead of diffstat

Browse Source 
Not everybody necessarily even has diffstat installed.
This commit is contained in:
Linus Torvalds
2005-05-30 17:45:41 -07:00
parent 53d4b46085
commit 866b973b5d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-resolve-script
View File

@ -41,7 +41,7 @@ if [ "$common" == "$head" ]; then
sleep 3 sleep 3
git-read-tree -m $merge && git-checkout-cache -f -u -a git-read-tree -m $merge && git-checkout-cache -f -u -a
echo $merge > "$GIT_DIR"/HEAD 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 exit 0
fi fi
echo "Trying to merge $merge into $head" 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 "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD echo $result_commit > "$GIT_DIR"/HEAD
git-checkout-cache -f -u -a 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