diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-21 01:24:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 01:24:45 -0700 |
| commit | ad9f72a7042e22d871c7c6441e8b220b7142d40f (patch) | |
| tree | e8406e084272930a6c2cfb6c8452ad55d29aa1a5 /git-checkout.sh | |
| parent | Merge branch 'jn/web' into next (diff) | |
| parent | checkout -f: do not leave untracked working tree files. (diff) | |
| download | tgif-ad9f72a7042e22d871c7c6441e8b220b7142d40f.tar.xz | |
Merge branch 'master' into next
* master:
checkout -f: do not leave untracked working tree files.
Log peer address when git-daemon called from inetd
Diffstat (limited to 'git-checkout.sh')
| -rwxr-xr-x | git-checkout.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 564117f006..77c2593809 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -137,8 +137,7 @@ fi if [ "$force" ] then - git-read-tree --reset $new && - git-checkout-index -q -f -u -a + git-read-tree --reset -u $new else git-update-index --refresh >/dev/null merge_error=$(git-read-tree -m -u $old $new 2>&1) || ( |