github - What's the difference between `git reset --hard master` and `git reset --hard origin/master`? -


i tried lot of links on stackoverflow/elsewhere understand behaviour of

git reset --hard option

i know that:

  • if omitted or if origin, reset done on recent commit on origin
  • if sha1 hash provided, reset done on corresponding commit.

what don't understand following values:

  1. origin
  2. head
  3. origin/master
  4. origin/branch

all seem have same behavior i.e. point latest commit on master.

please explain significance of 4 value option provided above.

i know if on specific branch how can reset last commit on branch? if example on v1.2, origin/v1.2 still takes me latest commit on master.

first of need understand branch , tag names pointers hash values, represent single commit, if there's 4 options have same behaviour, first logical answer because point same commit

  • origin i'm not sure think origin self resolve origin/head think dependent on github settings, in github set 'default branch', origin/head resolve origin/[default_branch], in case im assuming it's master, why has same effect origin/master.

  • head points current commit, 1 standing on, git reset --hard head permenantly remove changes in tracked files , staged files changes, not change commit hash.

  • origin/master last commit in remote master branch since last fetch/pull, each time commit master, local master updated , origin/master updated too, if else pushes master repo have no idea there update, unless git fetch origin/master move ahead of master, or maybe diverge.
    running git reset --hard origin/master have same effect if on master branch , master in sync origin/master

  • origin/branch i'm not sure represents, because there's no origin/branch default, i'm guessing created branch called branch , happens in same commit master, confirm can try doing git branch see branches, i'm guessing you'll find 1 called branch

to see in visual way, try running git log --graph --decorate --all or prefer visual tool gitk, if have binary installed run gitk --all see branches relative each other


Comments

Post a Comment

Popular posts from this blog

asp.net mvc - SSO between MVCForum and Umbraco7 -

i need integrate sso between mvcforum (forum of company) , umbraco7 (manages cms company). however struggling shared authentication work. tried several ways suggested on other threads still not running expected. here did: 1. in mvcforum (forum.mywebsite.com) 1.1. machine key in web.xml: <machinekey validationkey="the same key umbraco7" decryptionkey="the same key umbraco7" validation="sha1" decryption="aes" /> 1.2. authenticate forms in web.xml <forms name="my-sso-auth" protection="all" path="/" timeout="43200" domain="forum.mywebsite.com" loginurl="/members/logon" enablecrossappredirects="true" /> 2. in umbraco7 (news.mywebsite.com) 2.1. machine key in web.xml: <machinekey validationkey="the same key mvcforum" decryptionkey="the same key mvcforum" validation="sha1" decryption="aes" /> 2.2. a
Read more

Python Tkinter keyboard using bind -

i have problem using bind option can click button in keyboard, , call function once key pressed. tried taking other codes have similar purpose , saw i'm doing pretty same, though still have problem must've missed. thankful if me this. here's code: # -*- coding: utf-8 -*- #imports tkinter import * pil import imagetk, image import time import tkmessagebox #===========================================================================================================================================# #tkinter class class app(frame): def __init__(self, master=none): frame.__init__(self, master) self.pack() #===========================================================================================================================================# #game pieces classes class board: def __init__(self, rows = 7, columns = 6, picture_height = none, picture_width = none): self.rows = rows self.columns = columns self.picture
Read more

ubuntu - Selenium Node Not Connecting to Hub, Not Opening Port -

i'm trying set demo selenium grid. have digital ocean ubuntu 14.02 droplet. (i have 2 , tried set using 2 different machines got nowhere.) i'm trying run hub , node both locally. here input both hub, node, , nmap results. https://gist.github.com/mekhami/d5bbecca5ff0de9d2dc9 so, node starting tcp connection reset , port it's supposed operate on closed. i have had no luck in number of different options , configurations work. but... of course, worked randomly once. don't know why, don't know did, know 1 brief moment, node connected , saw on grid console. tried run test , went down again , i've never seen come up. please let me know more information can provide. update: randomly came online again. don't know happened, might related timeout or time_wait or going on. this because vm/server not have enough entropy available. to resolve problem, install haveged (or other similar things). the instructions of how install haveged on ubu
Read more