All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <junkio@cox.net>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: Merge git-gui into 1.5.0 ?
Date: Tue, 13 Feb 2007 00:38:14 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.63.0702130037530.22628@wbgn013.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <7v64a782ht.fsf@assigned-by-dhcp.cox.net>

Hi,

On Mon, 12 Feb 2007, Junio C Hamano wrote:

> Ok, so here is what I did last night.
> 
> $ git remote show git-gui
> * remote git-gui
>   URL: git://repo.or.cz/git-gui.git/
>   Tracked remote branches
>     master
> $ git fetch git-gui
> $ git read-tree --prefix=git-gui/ git-gui/master
> $ git checkout git-gui

Didn't you mean "git checkout master" here?

> $ git rev-parse git-gui/master >.git/MERGE_HEAD
> $ git commit

Ciao,
Dscho

  parent reply	other threads:[~2007-02-12 23:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-11  8:40 Merge git-gui into 1.5.0 ? Shawn O. Pearce
2007-02-11 14:57 ` Mark Levedahl
2007-02-11 22:49   ` Shawn O. Pearce
2007-02-11 16:39 ` Johannes Schindelin
2007-02-11 22:27 ` Junio C Hamano
2007-02-11 22:41   ` Shawn O. Pearce
2007-02-11 22:53     ` Johannes Schindelin
2007-02-11 23:02       ` Shawn O. Pearce
2007-02-11 23:25         ` Johannes Schindelin
2007-02-12  5:40         ` Michael S. Tsirkin
2007-02-12  5:48           ` Junio C Hamano
2007-02-12  5:59             ` Michael S. Tsirkin
2007-02-12  6:25               ` Michael S. Tsirkin
2007-02-12 11:51                 ` add negative -p to git-am, " Johannes Schindelin
2007-02-12 11:59                   ` Michael S. Tsirkin
2007-02-12 12:06                     ` Johannes Schindelin
2007-02-12 12:26                       ` Michael S. Tsirkin
2007-02-12 21:55     ` Junio C Hamano
2007-02-12 23:34       ` Shawn O. Pearce
2007-02-12 23:38       ` Johannes Schindelin [this message]
2007-02-12 23:42         ` Shawn O. Pearce
2007-02-12 23:53           ` Johannes Schindelin
2007-02-13  0:34             ` Jakub Narebski
2007-02-13  0:38               ` Shawn O. 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=Pine.LNX.4.63.0702130037530.22628@wbgn013.biozentrum.uni-wuerzburg.de \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=spearce@spearce.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 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.