merge - git branch merging details -


i noticed following branch merged master branch. have dev , master stream. branch merged dev how found in master when review master issuing git log origin/master command.

   commit 8123e23e3322b02b9871fea4d152e07ec5b9361443520d2    merge: e4d499a 5ef2bd6    author: devuser<user1@mydomain.org>    date:   fri jul 01 16:24:53 2013 -0700     merge branch 'my_branch' dev

is there way figure out how master branch?

example:

user run following:   git checkout master   git checkout -b my_branch   git add .   git commit -m "my work done"   git checkout dev   git merge my_branch   git push   user b run following:   git checkout my_branch   git pull   git checkout master   git merge my_branch   git push

in git log, can find out if user b did merge or user ?

please attached picture. says "merge branch "my_branch" dev" merging master. reading right?

enter image description here

iin git, "branch" can mean 2 things. actual commits in line of development or label tucked onto commit , updates when new commit made (the green boxes see in screenshot).

the label points recent commit in branch (the tip). labels can freely moved around , set commit like. can have multiple labels point @ exact same commit.

you can arrive in situation via 2 ways: branched off master of dev, or master contained (already merged) in dev, master fast-forwarded during next merge.


Comments

Post a Comment

Popular posts from this blog

basic authentication with http post params android -

i doing basic authentication passing username , password , using basicnamevaluepair sending post params response service. my method: public stringbuilder callservicehttppost(string username, string password, string type) { // create new httpclient , post header httpclient httpclient = new defaulthttpclient(); httppost httppost = new httppost(webservice + type); httpresponse response = null; stringbuilder total = new stringbuilder(); try { url url = new url(webservice + type); /*string base64encodedcredentials = base64.encodetostring((username + ":" + password).getbytes(), base64.url_safe | base64.no_wrap);*/ string base64encodedcredentials = "basic " + base64.encodetostring( (username + ":" + password).getbytes(), base64.no_wrap); httppost.setheader("auth...
Read more

vb.net - Virtual Keyboard commands -

i wondering difference between virtual these keyboard commands is: keyeventf_extendedkey , keyeventf_keyup is. everywhere have looked gives me description based off integers , not want know each of them does. you've tagged question vb.net, these have nothing @ vb.net. they're constants defined in windows header files, use win32 api functions. as far difference, can't tell looking @ values. individual values not particularly important, that's why named identifiers used. what's important used , documentation functions tells mean. the first one, keyeventf_extendedkey , used keybdinput structure (which used along e.g. sendinput function) pass information synthesized keyboard input. if flag used, means scan code should interpreted extended key. technically, means scan code preceded prefix byte value 224 (&he0 in hexadecimal notation). the second one, keyeventf_keyup , 1 of flags available use structure. means key being released (going up)...
Read more

How to get multiresult with multicondition in Sql Server -

i need solve this. hopefully can giving me advices. for sample, i've got data : proclib.march 1 first 10 rows flight date depart orig dest miles boarded capacity ----------------------------------------------------------------- 114 01mar94 7:10 lga lax 2475 172 210 202 01mar94 10:43 lga ord 740 151 210 219 01mar94 9:31 lga lon 3442 198 250 622 01mar94 12:19 lga fra 3857 207 250 132 01mar94 15:35 lga yyz 366 115 178 271 01mar94 13:17 lga par 3635 138 250 302 01mar94 20:22 lga 229 105 180 114 02mar94 7:10 lga lax 2475 119 210 202 02mar94 10:43 lga ord 740 120 210 219 02mar94 9:31 lga lon 344...
Read more