* git push doesn't honor .git/config
@ 2010-03-31 14:54 Phil Lawrence
2010-03-31 15:14 ` Matthieu Moy
0 siblings, 1 reply; 3+ messages in thread
From: Phil Lawrence @ 2010-03-31 14:54 UTC (permalink / raw)
To: git
I renamed a local branch from MIS-59 to MIS-59_project, and did the following:
git branch --set-upstream MIS-59_project origin/MIS-59
git push --set-upstream origin MIS-59_project:MIS-59
However, .git/config is not being honored by git push; I have to
supply all the parameters to actually push changes.
(MIS-59_project)$ git branch -v
MIS-38_labor_cat cab4fe6 [MIS-38] Create Master Labor Category import SQL
MIS-39_org 02f9e2f [MIS-39] Create Unanet's Organization export SQL
MIS-40_approval_grp 7c3b5ec [MIS-40] Create Unanet Approval Groups import SQL
MIS-41_location 8bd55ab [MIS-41] Create Unanet Master Locations import SQL
MIS-42_person 9fb1901 [MIS-42] Create SQL for Unanet's Person import
* MIS-59_project ed3acc9 [ahead 1] [MIS-59] Switch to using
get_project_type_unanet()
MIS-65_task 651a05b [MIS-65] Switch to using get_project_type_unanet()
master e98c105 Retired OTL
(MIS-59_project)$ grep -A2 MIS-59_project .git/config
[branch "MIS-59_project"]
remote = origin
merge = refs/heads/MIS-59
(MIS-59_project)$ git push
Everything up-to-date
(MIS-59_project)$ git branch -v
MIS-38_labor_cat cab4fe6 [MIS-38] Create Master Labor Category import SQL
MIS-39_org 02f9e2f [MIS-39] Create Unanet's Organization export SQL
MIS-40_approval_grp 7c3b5ec [MIS-40] Create Unanet Approval Groups import SQL
MIS-41_location 8bd55ab [MIS-41] Create Unanet Master Locations import SQL
MIS-42_person 9fb1901 [MIS-42] Create SQL for Unanet's Person import
* MIS-59_project ed3acc9 [ahead 1] [MIS-59] Switch to using
get_project_type_unanet()
MIS-65_task 651a05b [MIS-65] Switch to using get_project_type_unanet()
master e98c105 Retired OTL
(MIS-59_project)$ git push origin MIS-59_project:MIS-59
Counting objects: 11, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (6/6), 498 bytes, done.
Total 6 (delta 2), reused 0 (delta 0)
=> Syncing Gitorious... [OK]
To git@gitorious.burnsmcd.com:~plawrence/mis/plawrences-ora-apps.git
1fbf2e0..ed3acc9 MIS-59_project -> MIS-59
(MIS-59_project)$
Did I miss something, or is this incorrect behavior? BTW, I'm running
msysgit 1.7.0.2-preview20100309 on Windows XP.
Thanks,
Phil Lawrence
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git push doesn't honor .git/config
2010-03-31 14:54 git push doesn't honor .git/config Phil Lawrence
@ 2010-03-31 15:14 ` Matthieu Moy
2010-03-31 22:03 ` Phil Lawrence
0 siblings, 1 reply; 3+ messages in thread
From: Matthieu Moy @ 2010-03-31 15:14 UTC (permalink / raw)
To: Phil Lawrence; +Cc: git
Phil Lawrence <prlawrence@gmail.com> writes:
> I renamed a local branch from MIS-59 to MIS-59_project, and did the following:
> git branch --set-upstream MIS-59_project origin/MIS-59
> git push --set-upstream origin MIS-59_project:MIS-59
>
> However, .git/config is not being honored by git push; I have to
> supply all the parameters to actually push changes.
... or read the man better ;-)
branch.<name>.merge
[...] It tells git-fetch/git-pull which branch to merge and
can also affect git-push (see push.default). [...]
push.default
[...]
· matching push all matching branches. [...] This is the default.
· tracking push the current branch to its upstream branch.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git push doesn't honor .git/config
2010-03-31 15:14 ` Matthieu Moy
@ 2010-03-31 22:03 ` Phil Lawrence
0 siblings, 0 replies; 3+ messages in thread
From: Phil Lawrence @ 2010-03-31 22:03 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git
On Wed, Mar 31, 2010 at 10:14 AM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Phil Lawrence <prlawrence@gmail.com> writes:
>> ...
>> However, .git/config is not being honored by git push; I have to
>> supply all the parameters to actually push changes.
>
> ... or read the man better ;-)
>
> branch.<name>.merge
> [...] It tells git-fetch/git-pull which branch to merge and
> can also affect git-push (see push.default). [...]
>
> push.default
> [...]
> · matching push all matching branches. [...] This is the default.
> · tracking push the current branch to its upstream branch.
Thank you! That was helpful.
Phil Lawrence
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-31 22:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-31 14:54 git push doesn't honor .git/config Phil Lawrence
2010-03-31 15:14 ` Matthieu Moy
2010-03-31 22:03 ` Phil Lawrence
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 NNTP newsgroup(s).