From: Nicolas Pitre <nico@cam.org>
To: "Karl Hasselström" <kha@treskal.com>
Cc: "Randal L. Schwartz" <merlyn@stonehenge.com>, git@vger.kernel.org
Subject: Re: recent change in git.git/master broke my repos
Date: Thu, 25 Oct 2007 13:46:04 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.0.9999.0710251344220.22100@xanadu.home> (raw)
In-Reply-To: <20071025150107.GB31196@diana.vm.bytemark.co.uk>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 602 bytes --]
On Thu, 25 Oct 2007, Karl Hasselström wrote:
> On 2007-10-25 07:32:36 -0700, Randal L. Schwartz wrote:
>
> > And when are we gonna get "fast forward only" for git-merge?
>
> I'd like that too. For cases when I know I don't have to do a merge,
> and want git to yell at me if I'm mistaken. For example, in a
> repository that tracks an upstream so I can build the latest version,
> but where I don't normally do any development.
Isn't that called a remote branch that gets updated with "git fetch' ?
You can even trick Git into not using the refs/remotes/ namespace for
them if you wish.
Nicolas
next prev parent reply other threads:[~2007-10-25 17:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-25 14:32 recent change in git.git/master broke my repos Randal L. Schwartz
2007-10-25 15:01 ` Karl Hasselström
2007-10-25 17:46 ` Nicolas Pitre [this message]
2007-10-25 18:29 ` Randal L. Schwartz
2007-10-25 20:23 ` Andreas Ericsson
2007-10-25 20:38 ` Nicolas Pitre
2007-10-25 20:42 ` Andreas Ericsson
2007-10-26 7:39 ` Karl Hasselström
2007-10-25 15:51 ` Jeff King
2007-10-25 15:55 ` Randal L. Schwartz
2007-10-25 15:57 ` Jeff King
2007-10-25 15:58 ` Randal L. Schwartz
2007-10-25 16:01 ` Jeff King
2007-10-25 16:06 ` Randal L. Schwartz
2007-10-25 16:56 ` Jeff King
2007-10-25 18:05 ` Daniel Barkalow
2007-10-27 6:09 ` Junio C Hamano
2007-10-27 20:06 ` Daniel Barkalow
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=alpine.LFD.0.9999.0710251344220.22100@xanadu.home \
--to=nico@cam.org \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
--cc=merlyn@stonehenge.com \
/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).