| Your name and email address were configured automatically based | |
| on your username and hostname. Please check that they are accurate. | |
| You can suppress this message by setting them explicitly: | |
| git config --global user.name "Your Name" | |
| git config --global user.email you@example.com | |
| After doing this, you may fix the identity used for this commit with: | |
| git commit --amend --reset-author |
These examples were created during a discussion with j416 on #github about how best to manage long-running feature branches.
The scenario is this: You have a long-running feature branch, based off master. The feature branch and master both touch the same parts of the same files, so you know that there will be conflicts when you finally merge the feature branch in. What can you do to minimise the conflicts?
| # the following two lines give a two-line status, with the current window highlighted | |
| hardstatus alwayslastline | |
| hardstatus string '%{= kG}[%{G}%H%? %1`%?%{g}][%= %{= kw}%-w%{+b yk} %n*%t%?(%u)%? %{-}%+w %=%{g}][%{B}%m/%d %{W}%C%A%{g}]' | |
| # huge scrollback buffer | |
| defscrollback 5000 | |
| # no welcome message | |
| startup_message off |
| private void enableHTML5AppCache() { | |
| webView.getSettings().setDomStorageEnabled(true); | |
| // Set cache size to 8 mb by default. should be more than enough | |
| webView.getSettings().setAppCacheMaxSize(1024*1024*8); | |
| // This next one is crazy. It's the DEFAULT location for your app's cache | |
| // But it didn't work for me without this line | |
| webView.getSettings().setAppCachePath("/data/data/"+ getPackageName() +"/cache"); |
| // this script copies a youtube playlist to the "watch later" list, so you can easily clone the | |
| // list by creating a new one off the watch later list. You must run this on a playlist overview | |
| // page like http://www.youtube.com/playlist?list=xxxxxxxxx | |
| // this script is meant to be converted into a bookmarklet, using something like http://mrcoles.com/bookmarklet/ | |
| // after conversion, it becomes this: | |
| // javascript:(function()%7Bvar%20buttons%20%3D%20document.querySelectorAll(%22button.addto-watch-later-button%22)%3Bvar%20videos%20%3D%20document.querySelectorAll(%22.playlist-video-item%22)%3Bif%20(videos.length%20!%3D%20buttons.length)%20%7Balert(%22Some%20videos%20are%20already%20in%20watch%20later!%20Found%20%22%20%2B%20videos.length%20%2B%20%22%20videos%20but%20%22%20%2B%20buttons.length%20%2B%20%22%20buttons.%20Abort%20now.%22)%3B%7D%20else%20%7Bif%20(confirm(%22Add%20%22%20%2B%20buttons.length%20%2B%20%22%20videos%3F%22))%20%7Bvar%20dialog%20%3D%20document.createElement(%22h1%22)%3Bdialog.innerHTML%20%3D |
| // # Mocha Guide to Testing | |
| // Objective is to explain describe(), it(), and before()/etc hooks | |
| // 1. `describe()` is merely for grouping, which you can nest as deep | |
| // 2. `it()` is a test case | |
| // 3. `before()`, `beforeEach()`, `after()`, `afterEach()` are hooks to run | |
| // before/after first/each it() or describe(). | |
| // | |
| // Which means, `before()` is run before first it()/describe() |
| # Assuming an Ubuntu Docker image | |
| $ docker run -it <image> /bin/bash |
| // iMacro CheatSheet - Command Reference | |
| // http://wiki.imacros.net/Command_Reference | |
| // iMacros supports 3 types of variables: | |
| // * The macro variables !VAR0 thru !VAR9. They can be used with the SET and ADD command inside a macro. | |
| // * Built-in variables. They contain certain values set by iMacros. | |
| // * User-defined variables. They are defined in-macro using the SET command. | |
