git pull origin master is still ahead of origin/master by 1 commit -


i made commit on local copy of master , added commit separate branch / pull request. i'm on local master, start here:

git:(master) git status on branch master branch ahead of 'origin/master' 1 commit.   (use "git push" publish local commits) nothing commit, working directory clean

i want out of commit, since merge branch, i: 

git: (master) git pull origin master https://github.com/basho-labs/the-riak-community  * branch            master     -> fetch_head up-to-date.

and i'm still in same state. out of this, i: 

git:(master) git checkout head~1 note: checking out 'head~1'.  in 'detached head' state. can around, make experimental changes , commit them, , can discard commits make in state without impacting branches performing checkout.  if want create new branch retain commits create, may (now or later) using -b checkout command again. example:    git checkout -b new_branch_name  head @ abd0327...

but what's cleanest way handle history? don't want yet commit, i'm not sure how proceed. i've reviewed past conversations similar names , don't see useful answer.

i accidentally pushed more commits , had think through little more. ended up: 

git:(master)git reset --hard abd0327ec1b head @ abd0327 shortened introduction git:(master) git:(master) git status on branch master branch behind 'origin/master' 1 commit, , can fast-forwarded.   (use "git pull" update local branch) nothing commit, working directory clean git:(master) git:(master) git push -f total 0 (delta 0), reused 0 (delta 0) https://github.com/basho-labs/the-riak-community.git  + 5e39499...abd0327 master -> master (forced update)

and i'm happy history:

omglog output


Comments

Post a Comment

Popular posts from this blog

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

php - Nothing but 'run(); ' when browsing to my local project, how do I fix this? -

i added new project. made mistake in projectname.conf file in sites-available apache2, led me reinstalling apache2. after reinstalling , re-enabling projects on every page of every project .. <body> run(); </body> .. i've run composer update, restarted service, restarted pc, checked config files, tried disabling new project. there nothing in error log, , access.log: 127.0.0.1 - - [15/may/2015:01:40:47 +0200] "get / http/1.1" 304 181 "-" "mozilla/5.0 (x11; ubuntu; linux x86_64; rv:38.0) gecko/20100101 firefox/38.0" maybe i'm forgetting apache2 reinstall? don't think did different last time installed it. looks haven't setup php correctly. take @ this great guide , maybe you're forgetting link php config apache2.
Read more

php - How can I echo out this array? -

i don't know how go grabbing data in variable , put foreach loop. class tree{ private $info = array( array('name'=>'jim','state'=>'nu','company'=>'nu','phone'=>array('cell'=>'5615111111','office'=>'5611111111'),'email'=>array('primary'=>'exs@example.com','ex@there.com')), array('name'=>'joe smith','city'=>'phoenix','phone'=>'4805551111','email'=>'jsmith@some_email.com'), array('name'=>'john doe','city'=>'chandler','company'=>'doe co.','email'=>array('jdoe@gmail.com','personal'=>'email@email.com'),'phone'=>'6025550002') ); } if you're inside of class, can access private variable using $this->variablename . example, i...
Read more