git clone <yourgisturl> <usefulname>
cd <usefulname>
- edit the
.git/config
to have the origin remote point atgit@gist.github.com:1234.git
rather than the https url. I'm sure there is a git remote add <name> <forkurl>
git fetch <name>
git merge <name>/master --no-ff
git push origin master
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# bash completion for homesick(1) -*- shell-script -*- | |
_castlelist() | |
{ | |
echo $(homesick list | awk '{print $1}') | |
} | |
_homesick() | |
{ | |
local cur prev words cword |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# bash completion for nanoc -*- shell-script -*- | |
_nanoc() | |
{ | |
local cur prev words cword | |
_gst_init_completion -n = || return | |
COMPREPLY=( $( compgen -W "compile create view" -- "$cur") ) | |
} && | |
complete -F _nanoc nanoc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Simple calculator - from https://github.com/mathiasbynens/dotfiles/blob/master/.functions | |
function calc() { | |
local result="" | |
result="$(printf "scale=10;$*\n" | bc --mathlib | tr -d '\\\n')" | |
# └─ default (when `--mathlib` is used) is 20 | |
# | |
if [[ "$result" == *.* ]]; then | |
# improve the output for decimal numbers | |
printf "$result" | | |
sed -e 's/^\./0./' `# add "0" for cases like ".5"` \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# This script is based on one from | |
# https://forums.dropbox.com/topic.php?id=9644 | |
_dropbox() | |
{ | |
local cur prev opts | |
COMPREPLY=() | |
cur="${COMP_WORDS[COMP_CWORD]}" | |
prev="${COMP_WORDS[COMP_CWORD-1]}" | |
opts="status help puburl stop running start filestatus ls autostart exclude lansync" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# Automatically change a Blink(1)'s color based on system load | |
# Using which for convenience at the moment | |
# blink1-tool needs to be in your PATH | |
BLINK1_TOOL=`which blink1-tool` | |
# How long to sleep between polling | |
# If this is too low and the system is borderline it would swap | |
# back and forth. Also, since we are watching the load, there is |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# remove all trailing whitespace | |
sed -i 's/[ \t]*$//' $1 | |
# replace tabs with 4 places | |
sed -i 's/[\t]/ /g' $1 |
Defaults are in bold. Lots of ones that are missing can be configured to use clang-format.
tool | ver | built-in options |
---|---|---|
clang-format | 3.4 | LLVM, Google, Chromium, Mozilla, WebKit |
MS Visual Studio | ||
QT Creator | 3.2.1 | Qt, GNU |
Eclipse CDT | K&R, BSD/Allman, GNU, Whitesmiths | |
XCode |
This is a gist that is best viewed on bl.ocks.org.
Ticket #10813 touched most every file in Framework
and will almost definitely create merge conflicts with any branch. Here is a recipe for dealing with those conflicts using feature/10698_DGS_normalization as an example.
Note: There is nothing to worry about until you publish/push your changes.
-
Fetch everything and make sure you are up-to-date. In other words, go to your git repository and
git fetch -p -t
-
Checkout your branch
OlderNewer