From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Cc: Jared Hance <jaredhance@gmail•com>
Subject: Re: What's cooking in git.git (Mar 2011, #04; Wed, 23)
Date: Thu, 24 Mar 2011 00:30:32 -0700 [thread overview]
Message-ID: <7vpqphasbr.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7v62r9csqr.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 23 Mar 2011 16:38:36 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> [Stalled]
>
> * jh/merge-sans-branch (2011-02-10) 4 commits
> . merge: add support for merging from upstream by default
> - merge: introduce per-branch-configuration helper function
> - merge: introduce setup_merge_commit helper function
> - merge: update the usage information to be more modern
>
> There was an objection to the tip one that determines the upstream in a
> wrong way? I've been wanting to move this forward for quite some time but
> also hoping somebody else would send in a final version.
It turns out that most of the change in the series looked necessary only
because the last one tried to implement a wrong thing. The branch.*.merge
configuration variable names the branch on the remote side to be fetched
and merged by "git pull" and its value typically is refs/heads/something,
not the name of the remote tracking branch of such a remote branch.
I ended up redoing most of it and came up with a two-patch series, which
I'll be sending out shortly.
I won't be doing the tests, though. At least not tonight.
next prev parent reply other threads:[~2011-03-24 7:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 23:38 What's cooking in git.git (Mar 2011, #04; Wed, 23) Junio C Hamano
2011-03-24 0:39 ` Martin von Zweigbergk
2011-03-24 5:24 ` Junio C Hamano
2011-03-24 3:47 ` Nguyen Thai Ngoc Duy
2011-03-24 7:30 ` Junio C Hamano [this message]
2011-03-24 7:35 ` [PATCH 1/2] merge: match the help text with the documentation Junio C Hamano
2011-03-24 7:39 ` [PATCH 2/2] merge: merge with the default upstream with no argument Junio C Hamano
2011-05-05 14:05 ` Felipe Contreras
2011-05-05 17:33 ` Junio C Hamano
2011-05-05 20:26 ` Felipe Contreras
2011-03-24 8:00 ` What's cooking in git.git (Mar 2011, #04; Wed, 23) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vpqphasbr.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jaredhance@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox