git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin Waitz <tali@admingilde.org>
To: Junio C Hamano <junkio@cox.net>
Cc: "Karl Hasselström" <kha@treskal.com>,
	"Miles Bader" <miles@gnu.org>,
	git@vger.kernel.org
Subject: Re: git bug? + question
Date: Fri, 3 Nov 2006 10:59:06 +0100	[thread overview]
Message-ID: <20061103095905.GD7545@admingilde.org> (raw)
In-Reply-To: <7v3b90gbfv.fsf@assigned-by-dhcp.cox.net>

[-- Attachment #1: Type: text/plain, Size: 1017 bytes --]

hoi :)

On Fri, Nov 03, 2006 at 12:51:32AM -0800, Junio C Hamano wrote:
>     With separate remotes, I'd need something like:
> 
>             for b in master maint next pu
>             do
>                     git checkout $b && git pull && make || break
>             done
> 
>     And I also would need to have per-branch configuration to merge
>     from ". remotes/origin/$b" without re-fetching while on a
>     non-master branch $b, for the above to work.  I still need to
>     remember to process "master" first, so all things considered,
>     this is a regression in usability for my workflow.

you could also run git-fetch first and then always default to
the local repository.  But that would of course make pull just
a shortcut for merge, without any fetch.

Would it be so bad for you to call fetch three times?
I think the most intuitive thing for pull would be to fetch into
remotes/<remotename>/* and then to merge
remotes/<remotename>/<currentbranch>.

-- 
Martin Waitz

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  parent reply	other threads:[~2006-11-03  9:59 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-02  5:56 git bug? + question Miles Bader
2006-11-03  2:40 ` Junio C Hamano
2006-11-03  3:45   ` Sean
2006-11-03  7:48   ` Karl Hasselström
2006-11-03  8:51     ` Junio C Hamano
2006-11-03  9:09       ` Andy Parkins
2006-11-03 19:28         ` Junio C Hamano
2006-11-03  9:46       ` Karl Hasselström
2006-11-03 17:15         ` Josef Weidendorfer
2006-11-03 17:13           ` Jakub Narebski
2006-11-03 19:06             ` Josef Weidendorfer
2006-11-04 12:03           ` Junio C Hamano
2006-11-04 17:50             ` Josef Weidendorfer
2006-11-03  9:59       ` Martin Waitz [this message]
2006-11-03 10:27         ` Santi Béjar
2006-11-03 16:10       ` Linus Torvalds
2006-11-03 19:53         ` Junio C Hamano
2006-11-03  8:53     ` Andy Parkins
     [not found]   ` <20061102224549.499610d1.seanlkml@sympatico.ca>
2006-11-03  8:12     ` Karl Hasselström
2006-11-03  9:25       ` Sean
     [not found]       ` <20061103042540.192bbd18.seanlkml@sympatico.ca>
2006-11-03  9:51         ` Karl Hasselström
2006-11-03 20:29         ` Shawn Pearce
2006-11-03 21:27           ` Sean
2006-11-03 23:29           ` Jeff King
2006-11-04  5:10             ` Shawn Pearce
     [not found]           ` <20061103162707.cc8af608.seanlkml@sympatico.ca>
2006-11-04  5:04             ` Shawn Pearce
2006-11-03 20:36     ` Shawn Pearce
2006-11-03 21:24       ` Sean
2006-11-04 12:03         ` Junio C Hamano
2006-11-04 15:33           ` Sean
     [not found]           ` <20061104103325.bfb5e33e.seanlkml@sympatico.ca>
2006-11-04 19:07             ` Shawn Pearce
     [not found]       ` <20061103162422.b0bf105e.seanlkml@sympatico.ca>
2006-11-04  5:03         ` Shawn Pearce
2006-11-04 17:52           ` Josef Weidendorfer
2006-11-04 19:05             ` Shawn Pearce
2006-11-06 11:05               ` Josef Weidendorfer
2006-11-06  9:53             ` Andy Whitcroft
2006-11-06 11:00               ` Josef Weidendorfer
2006-11-06 12:32                 ` Andy Whitcroft

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=20061103095905.GD7545@admingilde.org \
    --to=tali@admingilde.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=kha@treskal.com \
    --cc=miles@gnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).