diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 23:24:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 23:24:14 (GMT) |
| commit | ce8781e8ab66fb90fb7baf8d953a4582a06571a7 (patch) | |
| tree | 85d3248a398a4549dc8ca8d00ad36bf94bdf4a6c /symlinks.c | |
| parent | cddec4f8aea4809131dc1b1765d6c8e2a498a58e (diff) | |
| parent | 5480207c4ee395fbb82682bc2065c93a43e24328 (diff) | |
| download | git-ce8781e8ab66fb90fb7baf8d953a4582a06571a7.zip git-ce8781e8ab66fb90fb7baf8d953a4582a06571a7.tar.gz git-ce8781e8ab66fb90fb7baf8d953a4582a06571a7.tar.bz2 | |
Merge branch 'vr/git-merge-default-to-upstream'
* vr/git-merge-default-to-upstream:
Show error for 'git merge' with unset merge.defaultToUpstream
Diffstat (limited to 'symlinks.c')
0 files changed, 0 insertions, 0 deletions