From: Ingo Molnar <mingo@elte.hu>
To: Petr Baudis <pasky@ucw.cz>
Cc: Martin Schlemmer <azarah@nosferatu.za.org>,
David Greaves <david@dgreaves.com>,
dwheeler@dwheeler.com, Daniel Barkalow <barkalow@iabervon.org>,
git@vger.kernel.org
Subject: Re: Change "pull" to _only_ download, and "git update"=pull+merge?
Date: Wed, 20 Apr 2005 22:45:51 +0200 [thread overview]
Message-ID: <20050420204551.GA13944@elte.hu> (raw)
In-Reply-To: <20050420200504.GB19112@pasky.ji.cz>
* Petr Baudis <pasky@ucw.cz> wrote:
> Dear diary, on Wed, Apr 20, 2005 at 09:01:57AM CEST, I got a letter
> where Ingo Molnar <mingo@elte.hu> told me that...
> > [...]
> > fatal: unable to execute 'gitmerge-file.sh'
> > fatal: merge program failed
>
> Pure stupidity of mine, I forgot to add gitmerge-file.sh to the list of
> scripts which get installed.
another thing is this annoying message:
rsync: link_stat "/linux/kernel/people/torvalds/git.git/tags" (in pub)
failed: No such file or directory (2)
rsync error: some files could not be transferred (code 23) at
main.c(812)
client: nothing to do: perhaps you need to specify some filenames or
the --recursive option?
you said before that it's "harmless", but it's annoying nevertheless as
one doesnt know for sure whether the pull went fine.
Ingo
next prev parent reply other threads:[~2005-04-20 20:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-16 1:56 [PATCH] Add "clone" support to lntree Daniel Barkalow
2005-04-16 2:47 ` Petr Baudis
2005-04-16 2:58 ` Petr Baudis
2005-04-16 3:16 ` Linus Torvalds
2005-04-16 11:39 ` Petr Baudis
2005-04-16 3:17 ` Daniel Barkalow
2005-04-16 23:33 ` Petr Baudis
2005-04-17 0:07 ` Daniel Barkalow
2005-04-19 1:12 ` Petr Baudis
2005-04-19 2:13 ` Change "pull" to _only_ download, and "git update"=pull+merge? David A. Wheeler
2005-04-19 9:18 ` David Greaves
2005-04-19 9:28 ` Petr Baudis
2005-04-19 10:05 ` Martin Schlemmer
2005-04-19 10:50 ` Petr Baudis
2005-04-19 13:54 ` Jon Seymour
2005-04-19 14:40 ` Martin Schlemmer
2005-04-19 18:28 ` Daniel Barkalow
2005-04-19 22:39 ` David A. Wheeler
2005-04-19 23:20 ` Daniel Barkalow
2005-04-20 7:01 ` Ingo Molnar
2005-04-20 20:05 ` Petr Baudis
2005-04-20 20:32 ` Ingo Molnar
2005-04-20 20:45 ` Ingo Molnar [this message]
2005-04-20 21:15 ` Petr Baudis
2005-04-20 23:58 ` David Mansfield
2005-04-16 3:06 ` Add "clone" support to lntree Daniel Barkalow
2005-04-16 23:00 ` Petr Baudis
2005-04-16 23:07 ` Daniel Barkalow
2005-04-16 23:44 ` Petr Baudis
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050420204551.GA13944@elte.hu \
--to=mingo@elte.hu \
--cc=azarah@nosferatu.za.org \
--cc=barkalow@iabervon.org \
--cc=david@dgreaves.com \
--cc=dwheeler@dwheeler.com \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).