![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:24:12 +0000 (15:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:24:14 +0000 (15:24 -0800) | ||
| commit | ce8781e8ab66fb90fb7baf8d953a4582a06571a7 | |
| tree | 85d3248a398a4549dc8ca8d00ad36bf94bdf4a6c | tree | snapshot |
| parent | cddec4f8aea4809131dc1b1765d6c8e2a498a58e | commit | diff |
| parent | 5480207c4ee395fbb82682bc2065c93a43e24328 | commit | diff |
Merge branch 'vr/git-merge-default-to-upstream'
* vr/git-merge-default-to-upstream:
Show error for 'git merge' with unset merge.defaultToUpstream
* vr/git-merge-default-to-upstream:
Show error for 'git merge' with unset merge.defaultToUpstream
| builtin/merge.c | diff1 | | diff2 | | blob | history |