diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-28 02:35:01 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 01:07:37 -0800 |
commit | bf699582fd7be26f7809858941fa831380e5bce7 (patch) | |
tree | 3a2228b8f45b0e2e05f0bedabee839a6dacf8874 /git-merge-stupid.sh | |
parent | 0bb733c91cb472a1a5b62381ff4037c6fb124e38 (diff) | |
download | git-bf699582fd7be26f7809858941fa831380e5bce7.tar.gz |
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>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions