summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-05 00:07:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-06 07:25:52 (GMT)
commit1127148089234a6f84754f2f0ec36cbbcae06fa9 (patch)
tree7f2ea0007bda442b6138168f72d6aa7355309bff /git-merge.sh
parentf8a9d4287277ed15d3f0d61004f4510c59f1f392 (diff)
downloadgit-1127148089234a6f84754f2f0ec36cbbcae06fa9.zip
git-1127148089234a6f84754f2f0ec36cbbcae06fa9.tar.gz
git-1127148089234a6f84754f2f0ec36cbbcae06fa9.tar.bz2
Loosen "working file will be lost" check in Porcelain-ish
This uses the previous update to read-tree in Porcelain-ish commands "git checkout" and "git merge" to loosen the check when switching branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 272f004..397b33f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -264,7 +264,7 @@ f,*)
echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
- git-read-tree -u -v -m $head "$new_head" &&
+ git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
finish "$new_head" "Fast forward"
dropsave
exit 0