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-checkout.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-checkout.sh')
| -rwxr-xr-x | git-checkout.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 737abd0c0..4192a99fe 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -161,7 +161,7 @@ then git-read-tree --reset -u $new else git-update-index --refresh >/dev/null - merge_error=$(git-read-tree -m -u $old $new 2>&1) || ( + merge_error=$(git-read-tree -m -u --exclude-per-directory=.gitignore $old $new 2>&1) || ( case "$merge" in '') echo >&2 "$merge_error" @@ -172,7 +172,8 @@ else git diff-files --name-only | git update-index --remove --stdin && work=`git write-tree` && git read-tree --reset -u $new && - git read-tree -m -u --aggressive $old $new $work || exit + git read-tree -m -u --aggressive --exclude-per-directory=.gitignore $old $new $work || + exit if result=`git write-tree 2>/dev/null` then |