#git log

之前提到程式開發的版本控制- Git 應用篇,

Git的功能強大可不是只有這些,

今天就來介紹一個

  程式開發的版本控制- Git 合併提交rebase

  首先到命令列打上

git log

系統會列出commit的紀錄,

    若今天想把最後的三個紀錄合併為一個提交commit時,

就需要利用

git   rebase -i   ‘commit 紀錄’ 或者 git   rebase -i   HEAD~~~

來進行

系統會列出這段期間的所有commit,

底下範例中有三個提交

各個紀錄前方系統預設帶入pick,

將最後兩個commit紀錄前方的pick改為squash,

squash在此的意義為

採用此commit並將其合併到上一個commit中,

也就是說此commit所做的任何改變都會被合併到上一個commit中

    編輯完畢之後,

按

ctrl  +  x

離開,

系…

git log | grep 'for reals'

    so tired. fix swf typo for reals

    no ad on active broadcast page for reals yo

    fix sidebar playlist sorting for reals

    for reals finished playlists

    for realsies fixed playlists, except some event bugs

    hopefully fixed bug 13554 (not saving pw) for reals this time

    bug 13424 - moar horrible queue auto scrolling to active song but only at for reals the right time crap

    eliminated a loop.. for reals this time

    okay fixed bug 11770 for reals

    for reals this time!

    bug 8761 for reals this time

git log | grep moar

    moar readme bits

    moar air fixes i am retarded

    moar swf traces

    swf with moar traces

    moar desktop fix

    moar drag stuff, upgraded dnd plugin, and some tiny grid bugfixes

    moar survey cleanup

    moar survey error handling

    No moar ie9

    bug 13424 - moar horrible queue auto scrolling to active song but only at for reals the right time crap

    moar bug 12973 - fixed automagic grid dragscrolling and made drag scrolling delays more sane in grid and queue, like i had previously done for dropzone

    bug 12915 - fixed grids in ie7 some moar

    Need moar facebook, but not too much

    Fix moar uku

    Need moar buttons yo

    moar feed comments

    fix bug 11724 moar

    moar context santizing

git log | grep zomg

    zomg make join/leave button in broadcastCell module (and therefore, sidebar tooltip), like forreals  reflect if you are in the broadcast

    Remove global scoped 'zomgwtfbbq'

    bug 11850 - zomg fans was triggering load indicator

    zomg rewrote notifications_controller so it has queueing and a max number on screen at once

    zomg i think this fixes it

    bug 8885 step one - eliminated console.error statements that are not real zomg-the-user-can-know-an-error-occured errors. downgraded to warn debug messages for features still in active development, otherwise removed

    zomg widgets >.<

    zomg facebook invites in invite lightbox

git log | grep tired

    I'm tired

    so tired. fix swf typo for reals

    idk, getting super tired, annoying rar

git log | grep idk

    idk, getting super tired, annoying rar

    fixed player issues, added now playing, idk some other stuff too who car...

    fixed player issues, added now playing, idk some other stuff too who cares

    search and index idk

    Fixed some bugs, idk which

    add gridkey to combat non-stable sort in playlists

git log | grep nbd