diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-13 11:10:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 11:10:24 -0800 |
| commit | f388cec3d77751a6c20b3b10415344f5355b5a2f (patch) | |
| tree | 557f4a01f9da0851617f290aa556e56e5c07092b /git-merge.sh | |
| parent | d0085ade9598942077f12f22b16978411d15188a (diff) | |
| parent | 22f741dab7cc93f00f7cf96cd65d7481677cd855 (diff) | |
| download | git-f388cec3d77751a6c20b3b10415344f5355b5a2f.tar.gz git-f388cec3d77751a6c20b3b10415344f5355b5a2f.tar.xz | |
Merge branch 'jc/read-tree-ignore'
* jc/read-tree-ignore:
read-tree: document --exclude-per-directory
Loosen "working file will be lost" check in Porcelain-ish
read-tree: further loosen "working file will be lost" check.
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 2f3d936b9..c895a04f6 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -265,7 +265,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 |