From: Lynbech Christian <christian.lynbech@tietoenator.com>
To: emacs-devel@gnu.org
Subject: Problem understanding git
Date: Fri, 23 May 2008 13:54:05 +0200 [thread overview]
Message-ID: <ytqpwsll6xsy.fsf@ul000205.eu.tieto.com> (raw)
Thanks to the good help from the list, I now have a git repository to
track which will work with the company firewall.
But I am having some problems in finding how to get git to do what I want.
I have first cloned the repository from
http://git.sv.gnu.org/r/emacs.git
Now I want to update this, ie. do the equivalent of a "cvs update".
On one machine, where I have git version 1.5.5.1, I just do a "git pull"
and the updates comes pouring in, but when I try the same on my laptop
where I only have git version 1.5.3.4, I get the following (to me)
cryptic error message:
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:
branch.master.remote = <nickname>
branch.master.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
I have so far been unable to deduce how to get the slightly older git
to do the update.
Is there a kind soul out there who could help enlighten me?
------------------------+-----------------------------------------------------
Christian Lynbech | christian #\@ defun #\. dk
------------------------+-----------------------------------------------------
Hit the philistines three times over the head with the Elisp reference manual.
- petonic@hal.com (Michael A. Petonic)
next reply other threads:[~2008-05-23 11:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-23 11:54 Lynbech Christian [this message]
2008-05-23 12:18 ` Problem understanding git dhruva
2008-05-23 13:20 ` Lynbech Christian
2008-05-23 14:00 ` İsmail Dönmez
2008-05-23 15:31 ` dhruva
2008-05-23 17:24 ` Stefan Monnier
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ytqpwsll6xsy.fsf@ul000205.eu.tieto.com \
--to=christian.lynbech@tietoenator.com \
--cc=emacs-devel@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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.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).