From: Martin Waitz <tali@admingilde.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Current Issues #3
Date: Mon, 22 May 2006 12:20:29 +0200 [thread overview]
Message-ID: <20060522102029.GE12810@admingilde.org> (raw)
In-Reply-To: <7v8xoue9eo.fsf@assigned-by-dhcp.cox.net>
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
hoi :)
On Mon, May 22, 2006 at 01:44:15AM -0700, Junio C Hamano wrote:
> 1. "upstream" refers to the remote section to use when
> running "git-{fetch,pull,push}" while on that branch.
>
> [branch "master"]
> upstream = "origin"
what do you do for [branch "next"] here?
Does it make sense to regard all refs/remotes/*/<branchname> as
upstream and merge these into the current branch when pulling?
Perhaps a pull could even merge all newly fetched remote heads
into the corresponding branch, but for that we'd need to be
able to merge without using the working dir.
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-05-22 10:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-22 8:44 Current Issues #3 Junio C Hamano
2006-05-22 10:18 ` Linus Torvalds
2006-05-22 11:19 ` Sean
2006-05-22 11:19 ` Sean
2006-05-23 21:58 ` Jakub Narebski
2006-05-22 10:20 ` Martin Waitz [this message]
2006-05-22 21:54 ` Daniel Barkalow
2006-05-22 22:02 ` Carl Worth
2006-05-22 23:12 ` Shawn Pearce
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=20060522102029.GE12810@admingilde.org \
--to=tali@admingilde.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.