GIT diff giving me different feedback than git merge -

-

when run

git diff fetch_head

it lists load of expected changes, since fetched updated version remote.

but....

when run

git merge fetch_head

it tells me date!!

where going wrong?

why fetch_head different head, after merge?

a merge creates new commit, containing changes original head, orig_head , fetch_head. means if original head contained changes not contained in fetch_head, new (merged) head different fetch_head since contains commits well.

thing check

it's possible current branch up-to-date fetch_head previous fetch, above reason, or reason.

to check this, sha (hex number) fetch head follows:

git log -1 fetch_head commit bec5aadef68a5d29c9d523358a0189b86cad4c82 author: alex brown <alex@xxx> date:   tue nov 16 10:05:19 2010 +0000      weather report

and copy first 6 digits of fetch_head: bec5aa

next, search sha in ancestry of head

git log head | grep "commit bec5aa" -a 5  commit bec5aadef68a5d29c9d523358a0189b86cad4c82 author: alex brown <alex@xxx> date:   tue nov 16 10:05:19 2010 +0000      weather report

if returns blank, fetch_head has been merged. differences see in current head, may merged head (or descendant).

*example demonstrate this"

cd /tmp mkdir 1 cd 1 git init echo "woo" > a.txt git add a.txt  git commit -m "first commit" cd .. git clone 1 2 cd 1 echo "its nice today" >> a.txt git commit -a -m "weather report" cd .. ls cd 2 ls echo "like peas in pod" > b.txt git add b.txt  git commit -m "sayings" git fetch git diff fetch_head git merge fetch_head git diff fetch_head

Comments

Post a Comment

Popular posts from this blog

android - Spacing between the stars of a rating bar? -

-
ho can set spacing beween stars? thats ratingbar: ratingbar = (ratingbar) inflater.inflate(r.layout.ratingbar, null); ratingbar.setlayoutparams(new layoutparams(layoutparams.wrap_content, layoutparams.wrap_content)); the layout: <?xml version="1.0" encoding="utf-8"?> <ratingbar xmlns:android="http://schemas.android.com/apk/res/android" style="@style/mystyle" android:layout_alignparentright="true" android:layout_height="19dp" android:layout_width="wrap_content" android:numstars="5"> </ratingbar> the style: <style name="mystyle" parent="@android:style/widget.ratingbar"> <item name="android:progressdrawable">@drawable/android_r2_ratingstar_yellow</item> <item name="android:indeterminatedrawable">@drawable/android_r2_ratingstar_grey</item> </style> thanks, cheers you have ...
Read more

html - Instapaper-like algorithm -

-
does of algorithm extracts contents webpage? instapaper ? there 2 steps instapaper does: find main content block on page (excluding headers, footers, menus etc) from content block extract , format text to find content block (typically html block element, div containing key page text content) instapaper uses algorithm 1 used readability . can @ source of readability.js see what's going on, @ core tries find area on page highest text/link ratio, although has other simple scoring metrics (e.g. off top of head, things ratio of text commas, para elements etc) go heuristics. once have identified root node element, relevant content, you'll need format it, if want can pull node element containing text out of source document , insert yours, in reality you'll want remove existing styles , apply own, standard , feel. if want output nice text-only can use jericho's renderer . update1 : should mention else instapaper - follow 'pagination' links (...
Read more

c# - How to execute a particular part of code asynchronously in a class -

-
i creating speech recognition engine that's going respond user commands.i have created button enable , disable speech recognition per user convenience.i have used dispose() of speech engine disable speech recoginition.here code private void button1_click(object sender, routedeventargs e) { engineon = !engineon; if (engineon) { speechengine = speech.createspeechengine(); //speech class creates , returns new speech engine. speechengine.audiolevelupdated += new eventhandler<audiolevelupdatedeventargs>(speechengine_audiolevelupdated); // use system's default microphone speechengine.setinputtodefaultaudiodevice(); speechengine.loadgrammar(new dictationgrammar()); // start listening speechengine.recognizeasync(recognizemode.multiple); } else { speechclass.myengine.dispose(); } } but disposal of speech obj...
Read more