version control - Why does a 'git pull' not also update the remote branch I pulled from? -


i have forked repository, set remote called origin, , forked original repository have push access to, called upstream.

i have checked out patch release branch stored in both repositories:

git branch -va  develop                              8888888 patch-branch-0.9.x                   1111111 remotes/origin/develop               8888888 remotes/origin/patch-branch-0.9.x    1111111 remotes/upstream/develop             8888888 remotes/upstream/patch-branch-0.9.x  1111111

i know there have been merged pull requests in upstream, if to run git fetch --all git branch -va, might expect see:

git branch -va  ... patch-branch-0.9.x                   1111111 ... remotes/upstream/patch-branch-0.9.x  2222222

but prefer simple pull when updating local branch. but, when run pull upstream:

git checkout patch-branch-0.9.x git pull upstream patch-branch-0.9.x

even though reports:

from https://bitbucket.org/...  * branch            patch-branch-0.9.x -> fetch_head updating 1111111..2222222

it not seem update status of branch pulled from, end with:

git branch -va  ... patch-branch-0.9.x                   2222222 ... remotes/upstream/patch-branch-0.9.x  1111111

so though local branch has been updated fast-forward remote upstream branch, still have run git fetch --all have git branch -va report proper head commit remote branch. (even though it's 1 pulled from!)

is standard behavior? under impression pull fetch followed merge?


Comments

Post a Comment

Popular posts from this blog

blackberry 10 - how to add multiple markers on the google map just by url? -

i have android application, want convert blackberry 10 , google map needed in app,but blackberry 10 not support googlemap , blackberry developer web site supply way replace it.the sample below: @override public void oncreate(bundle savedinstancestate) { super.oncreate(savedinstancestate); setcontentview(r.layout.main); webview webview = (webview) findviewbyid(r.id.mywebview); webview.getsettings().setjavascriptenabled(true); webview.loadurl("http://maps.google.com/?ll=36.97, -122&lci=bike&z=13&t=p"); } i cannot understand it,i not know how add multiple markers on googlemap via url? can me? this worked me map shown in webview.
Read more

php - guestbook returning database data to flash -

i've been struggling problem long , unable make work, hope can me it. first, know php files correct , mysql database works fine. in flash, able submit comment database comments not display. did many tests such making returned_database flash separately , worked fine - can see old comments. long combine submitting 1 , returning 1 together, flash doesn't show comments more. put lower version flash effects on frame thinking doesn't collaborate returning flash, submitting flash works fine. since pretty complex problem hard me copy actionscript code because on different frames in flash. if has ideas fixing maybe can send file you?
Read more

java - Using an Integer ArrayList in Android -

i needing creating arraylist , adding integers them. essentially, have card game pulls card , saves id (bcid). want add pulled id arraylist, can avoid pulling same card twice. have setup below, keep getting duplicates. know cards pulling correctly, displays fine - repeated cards, unfortunately. any can provide great! have done best include relevant parts. if need additional information, let me know. public static integer bcid1, bcid2, bcid3, bcid4, bcid5, bcdcid; public static list<integer> usedcards = new arraylist<integer>(); in example below, supposed detect duplicate initialize sequence draw different card. public static void setids() { try { bcid1 = integer.parseint(bc1); usedcards.add(bcid1); } catch(numberformatexception nfe) { } try { bcid2 = integer.parseint(bc2); if (usedcards.contains(bcid2)) { try { bluecard2(ctx); } ...
Read more