diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-24 18:54:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 18:54:24 -0700 |
| commit | 3857284f7b892f855edffc5b9c196a0dd74b1b7d (patch) | |
| tree | 76754f705371a6a6c4d0e55fa806feb53bd0e64f /git-checkout-script | |
| parent | 96fdc218f726b1a7c0eb195fcadabadf46f9c2f8 (diff) | |
| parent | 569061432e3a695d5a4178d515971ddcc0a80709 (diff) | |
Merge refs/heads/master from . v0.99.5
Diffstat (limited to 'git-checkout-script')
| -rwxr-xr-x | git-checkout-script | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-checkout-script b/git-checkout-script index a37740713e..9feff149ac 100755 --- a/git-checkout-script +++ b/git-checkout-script @@ -72,4 +72,6 @@ if [ "$?" -eq 0 ]; then fi [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD" rm -f "$GIT_DIR/MERGE_HEAD" +else + exit 1 fi |