From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: git pull and merging.
Date: Wed, 06 Dec 2006 11:28:00 +0100 [thread overview]
Message-ID: <el65rh$tfj$3@sea.gmane.org> (raw)
In-Reply-To: cc723f590612060205p1fd26cd7u3c7efc723b0177de@mail.gmail.com
Aneesh Kumar wrote:
> [branch "devel"]
> remote = origin
> merge = devel
Does
[branch "refs/heads/devel"]
remote = origin
merge = refs/remotes/origin/devel
works?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-06 10:30 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-06 4:51 git pull and merging Aneesh Kumar
2006-12-06 5:02 ` Junio C Hamano
2006-12-06 5:21 ` Aneesh Kumar
2006-12-06 9:26 ` Johannes Schindelin
2006-12-06 10:00 ` Peter Baumann
2006-12-06 10:14 ` Johannes Schindelin
2006-12-06 10:23 ` Peter Baumann
2006-12-06 10:05 ` Aneesh Kumar
2006-12-06 10:28 ` Jakub Narebski [this message]
[not found] ` <cc723f590612060236k7839942el8d048eedfdee3682@mail.gmail.com>
[not found] ` <cc723f590612060248y6f730a54l3a2aadfa6500d36d@mail.gmail.com>
2006-12-06 10:48 ` Fwd: " Aneesh Kumar
2006-12-06 16:44 ` Josef Weidendorfer
2006-12-07 6:46 ` Aneesh Kumar K.V
2006-12-07 11:27 ` Josef Weidendorfer
2006-12-07 19:06 ` Junio C Hamano
2006-12-07 22:54 ` Josef Weidendorfer
2006-12-08 1:56 ` Santi Béjar
2006-12-08 17:23 ` Josef Weidendorfer
2006-12-08 19:12 ` [PATCH] Add branch.*.localmerge and documentation update Josef Weidendorfer
2006-12-08 20:52 ` Santi Béjar
2006-12-08 21:38 ` Junio C Hamano
2006-12-08 21:48 ` Jakub Narebski
2006-12-08 22:01 ` Josef Weidendorfer
2006-12-08 22:34 ` Junio C Hamano
2006-12-08 23:17 ` Josef Weidendorfer
2006-12-08 23:41 ` Junio C Hamano
2006-12-09 1:28 ` [PATCH] Add branch.*.merge warning " Josef Weidendorfer
2006-12-09 16:14 ` Santi Béjar
2006-12-08 21:39 ` [PATCH] Add branch.*.localmerge " Josef Weidendorfer
2006-12-08 22:15 ` Santi Béjar
2006-12-08 20:09 ` git pull and merging Santi Béjar
2006-12-08 7:07 ` Junio C Hamano
2006-12-07 23:06 ` Junio C Hamano
2006-12-08 2:04 ` Santi Béjar
2006-12-08 11:48 ` Jakub Narebski
2006-12-06 9:31 ` Jakub Narebski
2006-12-06 9:58 ` Johannes Schindelin
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='el65rh$tfj$3@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.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.