mschulkind

$ GIT_TRACE=1 git pull --rebase origin master
trace: exec: 'git-pull' '--rebase' 'origin' 'master'
trace: run_command: 'git-pull' '--rebase' 'origin' 'master'
trace: built-in: git 'rev-parse' '--git-dir'
trace: built-in: git 'rev-parse' '--is-bare-repository'
trace: built-in: git 'rev-parse' '--show-toplevel'
trace: built-in: git 'ls-files' '-u'
trace: built-in: git 'symbolic-ref' '-q' 'HEAD'
trace: built-in: git 'config' 'pull.ff'
trace: built-in: git 'rev-parse' '-q' '--verify' 'HEAD'

mschulkind

[branch "master"]
        remote = origin
        merge = refs/heads/master
        rebase = true

mschulkind

* 62a233a (HEAD, heroku/master, master)
* 79e11da
| * 40d2177 (origin/av/78576752, av/78576752)
|/  
*   c448b7f (origin/master)
 
 
$ git pull --rebase origin master
From github.com:...
 * branch            master     -> FETCH_HEAD

mschulkind

$ git rev-parse master origin/master; git pull --rebase origin master; git rev-parse master origin/master
62a233aab9a09f764edee0512691eacc459da8d0
c448b7fd2f529fd58878eff320086957d36a9fe2
From github.com:summit-partners/crm
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
c448b7fd2f529fd58878eff320086957d36a9fe2
c448b7fd2f529fd58878eff320086957d36a9fe2

mschulkind

{:timestamp=>"2014-05-08T04:49:21.066000+0000", :message=>"config LogStash::Outputs::ElasticSearch/@action = \"index\"", :level=>:debug, :file=>"logstash/config/mixin.rb", :line=>"105"}
{:timestamp=>"2014-05-08T04:49:28.311000+0000", :message=>"Starting lumberjack input listener", :address=>"0.0.0.0:12345", :level=>:info, :file=>"logstash/inputs/lumberjack.rb", :line=>"38"}
{:timestamp=>"2014-05-08T04:49:28.721000+0000", :message=>"Pipeline started", :level=>:info, :file=>"logstash/pipeline.rb", :line=>"78"}
{:timestamp=>"2014-05-08T04:49:35.001000+0000", :message=>"New Elasticsearch output", :cluster=>nil, :host=>"localhost", :port=>"9201", :embedded=>false, :protocol=>"http", :level=>:info, :file=>"logstash/outputs/elasticsearch.rb", :line=>"240"}
{:timestamp=>"2014-05-08T04:49:35.013000+0000", :message=>"Automatic template management enabled", :manage_template=>"true", :level=>:info, :file=>"logstash/outputs/elasticsearch.rb", :line=>"259"}
{:timestamp=>"2014-05-08T04:49:35.015000+0000", :message=>"Using m

mschulkind

class StateFlow
  module Entity
    def included(base)
      base.field :state type: :symbol
    end
  end

  def run_forever
    every(10.seconds) do
      # Find every entity that we know how to transition, queue the appropriate

mschulkind

def establish_s3_connection!
  AWS::S3::Base.establish_connection!(
    access_key_id: ENV['AMAZON_ACCESS_KEY_ID'], 
    secret_access_key: ENV['AMAZON_SECRET_ACCESS_KEY']
  )
end

establish_s3_connection!

local_file_name = 'bar/foo.zip'

mschulkind

terrapin matt # emerge -auNDv --tree world

These are the packages that would be merged, in reverse order:

Calculating dependencies... done!
[nomerge       ] net-fs/samba-3.5.11  USE="acl aio avahi client cups fam ldap netapi pam readline server smbclient -addns -ads -caps -cluster -debug -doc -examples -ldb -quota -smbsharemodes -smbtav2 -swat -syslog -winbind"  [0]
[ebuild     U  ]  sys-libs/talloc-2.0.7 [2.0.1-r1] USE="-compat -python% (-doc%) (-static-libs%) (-swig%)" 363 kB [0]
[ebuild    FU  ] dev-java/sun-jre-bin-1.6.0.31 [1.6.0.29] USE="X alsa -jce -nsplugin" 20,814 kB [0]
[ebuild     U  ] www-plugins/adobe-flash-11.1.102.63 [11.1.102.55] USE="64bit kde (multilib) vdpau -32bit" 6,878 kB [0]
[ebuild     U ~] www-plugins/google-talkplugin-2.6.1.0 [2.5.6.0] USE="libnotify system-libCg" LINGUAS="-ar% -bg% -bn% -ca% -cs% -da% -de% -el% -en% -es% -et% -fa% -fi% -fil% -fr% -gu% -hi% -hr% -hu% -id% -is% -it% -ja% -kn% -ko% -lt% -lv% -ml% -mr% -ms% -nl% -no% -or% -pl% -ro% -ru% -sk% -sl% -sr% -sv% -ta% -te% -

mschulkind

terrapin matt # emerge -auNDv world      

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild     U  ] dev-libs/expat-2.0.1-r6 [2.0.1-r5] USE="unicode%* -examples -static-libs" 0 kB [0]
[ebuild     U  ] media-libs/libogg-1.3.0 [1.2.0] USE="-static-libs" 283 kB [0]
[ebuild     U  ] dev-libs/icu-4.8.1.1-r1 [4.8.1-r2] USE="-debug -doc -examples -static-libs" 18,239 kB [0]
[ebuild     U  ] sys-devel/gnuconfig-20110814 [20110202] 50 kB [0]
[ebuild     U  ] sys-apps/pciutils-3.1.9-r1 [3.1.7] USE="-compress-db% -network-cron -static-libs% -zlib" 333 kB [0]

mschulkind

terrapin matt # emerge -p qt-test

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild   R    ] x11-libs/qt-test-4.7.2 

WARNING: One or more updates have been skipped due to a dependency conflict:

x11-libs/qt-core:4