kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-resolve-script: don't wait for three seconds any more 

We used to overwrite peoples dirty state.  We don't any more.  So don't
print the scary message and don't delay, just do the update already.
maint
Linus Torvalds 2005-06-06 17:39:14 -07:00
parent c7c4bbe631
commit 3f4eff7530
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-resolve-script
View File

@ -36,9 +36,6 @@ if [ "$common" == "$merge" ]; then
fi fi
if [ "$common" == "$head" ]; then if [ "$common" == "$head" ]; then
echo "Updating from $head to $merge." echo "Updating from $head to $merge."
echo "Destroying all noncommitted data!"
echo "Kill me within 3 seconds.."
sleep 3
git-read-tree -u -m $head $merge || exit 1 git-read-tree -u -m $head $merge || exit 1
echo $merge > "$GIT_DIR"/HEAD echo $merge > "$GIT_DIR"/HEAD
git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat