-

~/src/mapbox-gl-js〉g status
rebase in progress; onto 43297bc
You are currently rebasing branch 'master' on '43297bc'.
  (all conflicts fixed: run "git rebase --continue")

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	bundle.js
	debug/TufaGWH.gif
	debug/download.gif
	debug/extent_demo.json
	debug/giphy.gif
	debug/point.json
	js/source/tile_data.js

nothing added to commit but untracked files present (use "git add" to track)