diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-20 19:17:33 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-22 12:53:59 -0700 |
| commit | a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d (patch) | |
| tree | 85511431579f68ce408f37e6cc35a6e1fe154876 /branch.h | |
| parent | 779792a5f24bb4e8049c4f88ad752e70d4a8a080 (diff) | |
| download | git-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.tar.gz | |
merge: enable defaulttoupstream by defaultfc/merge-default-to-upstream
There's no point in this:
% git merge
fatal: No commit specified and merge.defaultToUpstream not set.
We know the most likely scenario is that the user wants to merge the
upstream, and if not, he can set merge.defaultToUpstream to false.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.h')
0 files changed, 0 insertions, 0 deletions