![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 28 Dec 2006 07:35:01 +0000 (02:35 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 28 Dec 2006 09:07:37 +0000 (01:07 -0800) | ||
| commit | bf699582fd7be26f7809858941fa831380e5bce7 | |
| tree | 3a2228b8f45b0e2e05f0bedabee839a6dacf8874 | tree | snapshot |
| parent | 0bb733c91cb472a1a5b62381ff4037c6fb124e38 | commit | diff |
Ensure `git-pull` fails if `git-merge` fails.
If git-merge exits with a non-zero exit status so should git-pull.
This way the caller of git-pull knows the task did not complete
successfully simply by checking the process exit status.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
If git-merge exits with a non-zero exit status so should git-pull.
This way the caller of git-pull knows the task did not complete
successfully simply by checking the process exit status.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-pull.sh | diff | blob | history |