From: Jan Nieuwenhuizen <hidden> Date: 2016-06-15 22:47:42
Hi,
git pull -r*) URL says:
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>
and after cut-and-pasting that into .git/config, replacing
<foo> with values, I get
$ git pull -r http://github.com/../../master
fatal: bad config file line 17 in .git/config
where line 17 is [without any indentation]
branch.master.remote = eddy
This is with git version version 1.6.3.3
Greetings,
Jan. -- who just finds out the uninstall target is missing?!?
See attached.
*) I've been wondering why GIT lacks a "update", ie
pull-without-merge command. You almost never want
to git pull /without/ -r?
--
Jan Nieuwenhuizen [off-list ref] | GNU LilyPond - The music typesetter
Avatar®: http://AvatarAcademy.nl | http://lilypond.org
From: Tomas Carnecky <hidden> Date: 2016-06-15 22:47:42
On Nov 11, 2009, at 2:22 PM, Jan Nieuwenhuizen wrote:
Hi,
git pull -r*) URL says:
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>
These are meant to be used with git-config(1):
git config branch.master.remote <nickname>
Or if you want to manually edit the config file, add this:
[branch "master"]
remote = <nickname>
etc.
and after cut-and-pasting that into .git/config, replacing
<foo> with values, I get
$ git pull -r http://github.com/../../master
fatal: bad config file line 17 in .git/config
where line 17 is [without any indentation]
branch.master.remote = eddy
This is with git version version 1.6.3.3
Greetings,
Jan. -- who just finds out the uninstall target is missing?!?
See attached.
Next time please send patches inline, it's easier to review them that
way.
*) I've been wondering why GIT lacks a "update", ie
pull-without-merge command. You almost never want
to git pull /without/ -r?
As 'pull == fetch + merge' (pull -r == fetch + rebase), pull without
merge would be fetch.
tom
From: Jan Krüger <hidden> Date: 2016-06-15 22:47:42
Hi,
git pull -r*) URL says: [...]
branch.master.remote = <nickname>
and after cut-and-pasting that into .git/config, replacing
<foo> with values, I get [...]
fatal: bad config file line 17 in .git/config
where line 17 is [without any indentation]
branch.master.remote = eddy
The confusion is that while you can set values with this syntax if
you're using git config (git config branch.master.remote <some value>),
they're written differently in actual config files:
[branch "master"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
I can't think of a message of comparable length that would make this
clearer, though.
Jan. -- who just finds out the uninstall target is missing?!?
See attached.
I have no comments about the patch contents themselves, but please read
Documentation/SubmittingPatches. Most importantly, patches are
usually sent inline here, and without a signoff line they can't be
accepted for inclusion in the official repository.
*) I've been wondering why GIT lacks a "update", ie
pull-without-merge command. You almost never want
to git pull /without/ -r?
-r stands for "rebase", i.e. it makes git pull use rebase instead of
merge. Rebase has certain problematic implications for decentralized
development, which is why it should only really be used in specific
circumstances (for rebasing commits that haven't been published in any
way yet).
"You" may almost never want to use git pull without rebase, but "many
others" do, and very often. Personally, I donn't recall a single
occasion where I have used git pull --rebase (not counting git-svn
stuff).
Anyway, look at config options branch.autosetuprebase and
branch.<nickname>.rebase to see how you can make pull use rebase by
default.
-Jan
From: Jan Nieuwenhuizen <hidden> Date: 2016-06-15 22:47:44
Op woensdag 11-11-2009 om 15:08 uur [tijdzone +0100], schreef Tomas
Carnecky:
quoted
Greetings,
Jan. -- who just finds out the uninstall target is missing?!?
See attached.
Next time please send patches inline, it's easier to review them that
way.
Sorry. Let me retry that. See below.
Greetings,
Jan.
--
Jan Nieuwenhuizen [off-list ref] | GNU LilyPond - The music typesetter
Avatar®: http://AvatarAcademy.nl | http://lilypond.org
From f260a4dcf0b42088eb1da74aee49f49ac4b0c55b Mon Sep 17 00:00:00 2001