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 - Exception while importing pymorphy2 -

i've installed pymorphy2 using pip: requirement satisfied (use --upgrade upgrade): pymorphy2 in /usr/local/lib/python2.7/site-packages requirement satisfied (use --upgrade upgrade): docopt>=0.6 in /usr/local/lib/python2.7/site-packages (from pymorphy2) requirement satisfied (use --upgrade upgrade): pymorphy2-dicts<3.0,>=2.4 in /usr/local/lib/python2.7/site-packages (from pymorphy2) but when i'm trying import library in python interactive shell this: >>> import pymorphy2 traceback (most recent call last): file "<stdin>", line 1, in <module> file "/usr/local/lib/python2.7/site-packages/pymorphy2/__init__.py", line 3, in <module> .analyzer import morphanalyzer file "/usr/local/lib/python2.7/site-packages/pymorphy2/analyzer.py", line 10, in <module> pymorphy2 import opencorpora_dict file "/usr/local/lib/python2.7/site-packages/pymorphy2/opencorpora_dict/__init__.py", line 4, ...
Read more

c# - Nested Internal Class with Readonly Hashtable throws Null ref exception.. on assignment -

in internal game class , have both a) defined nested internal gamertags class , b) defined gamertags[] _array variable. in internal gamertags class (the nested class, simplicity left out) have readonly hashtable . after initialization, still null ref exception when try assign value. i'm not changing pointer value only , need add initialization hastable? internal class gamertags { private readonly hashtable _privatereadonlyhashtable; private string _json; private string _hash; internal idictionary privatereadonlyhashtable { { return this._privatereadonlyhashtable; } } internal string hash { { this.ensurehash(); return this._hash; } } internal object this[string key] { { return this._privatereadonlyhashtable[k...
Read more