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
## within current branch, squashes all commits that are ahead of master down into one | |
## useful if you merged with upstream in the middle of your commits (rebase could get very ugly if this is the case) | |
## commit any working changes on branch "mybranchname", then... | |
git checkout master | |
git checkout -b mybranchname_temp | |
git merge --squash mybranchname | |
git commit -am "Message describing all squashed commits" | |
git branch -m mybranchname mybranchname_unsquashed | |
git branch -m mybranchname |
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 little gist shows how to easily internationalize your application using the meteor-just-i18n package. | |
# Package repository: https://github.com/subhog/meteor-just-i18n/ | |
# 1. Adding the package. | |
$ meteor add anti:i18n |
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
►► meteor-autoform-wizard ►► (master) | |
meteor publish --create | |
Please log in with your Meteor developer account. If you don't have one, you can quickly create one at www.meteor.com. | |
Username: nivir | |
Password: | |
/Users/Roy/.meteor/packages/meteor-tool/.1.1.10.18880n++os.osx.x86_64+web.browser+web.cordova/mt-os.osx.x86_64/dev_bundle/lib/node_modules/fibers/future.js:278 | |
throw(ex); | |
^ | |
Error: socket hang up |
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
Show hidden characters
[ | |
{ "keys": ["f12"], "command": "htmlprettify"}, | |
{ "keys": ["f1"], "command": "fold" }, | |
{ "keys": ["f2"], "command": "unfold" }, | |
{ "keys": ["ctrl+à"], "command": "show_overlay", "args": {"overlay": "goto", "text": "@"} }, | |
{ "keys": ["ctrl+!"], "command": "show_overlay", "args": {"overlay": "goto", "text": ":"} }, | |
{ "keys": ["ctrl+space"], "command": "auto_complete" }, | |
{ "keys": ["ctrl+space"], "command": "replace_completion_with_auto_complete", "context": | |
[ | |
{ "key": "last_command", "operator": "equal", "operand": "insert_best_completion" }, |
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
#!/usr/bin/env python | |
"""A simple utility to restore file creation and modification | |
dates back to their original values from EXIF. | |
This script requires exif module to be installed or the exif | |
command line utility to be in the path. | |
To function correctly under windows this script needs win32file and | |
win32con modules. Otherwise it will not be able to restore the creation |
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
#! /usr/bin/env python | |
# License: http://creativecommons.org/publicdomain/zero/1.0/ | |
# See http://preshing.com/20130115/view-your-filesystem-history-using-python | |
import optparse | |
import os | |
import fnmatch | |
import time | |
# Parse options | |
parser = optparse.OptionParser(usage='Usage: %prog [options] path [path2 ...]') |
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
server.gaddeagroup.com,146.185.172.6 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8JBN1GY0lObADO4tRBxJugw4bL/hP6jxyU+C6MNJnpUXmlhnJee8XWu3KA9ZfDEPHOkXOrifaQlnenVS/ACdGjOUs79Eh4DSXiQdzu+urznU21bGzbihBIGxCTwMfHp7vZGA7U3Iew+4rXpCvDFt1iea0CQGgbK3vxEgBxovVT5Ze5u4QpUVLzCfGC/jQ9Ahzom2Ed/s0XLJzQF28qRptv51GOslGpbFCcVd/bHVCIlHD4OoMMkeyZG1UOu+r1Fg7LoVMRxoWRDqggow+5kZ4b4nug9H+kVDus/o4m5Cip4BxlnZRrgHJ8opyPorW+HzWDQ8wt5i6L28SZFQdgkSr |
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
git clone ssh://[email protected]/project_name/repository.git | |
Cloning into 'inventopy_src'... | |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ | |
@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @ | |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ | |
The RSA host key for server_location has changed, | |
and the key for the corresponding IP address 46.101.128.148 | |
is unknown. This could either mean that | |
DNS SPOOFING is happening or the IP address for the host | |
and its host key have changed at the same time. |
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
git pull | |
remote: Counting objects: 3, done. | |
remote: Total 3 (delta 0), reused 0 (delta 0) | |
Unpacking objects: 100% (3/3), done. | |
From ssh://project_location | |
* [new branch] master -> origin/master | |
There is no tracking information for the current branch. | |
Please specify which branch you want to merge with. | |
See git-pull(1) for details |
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
git push -u origin master | |
To ssh://[email protected]_server_location.git | |
! [rejected] master -> master (fetch first) | |
error: failed to push some refs to 'ssh://git@server_location/inventopy_src.git' | |
hint: Updates were rejected because the remote contains work that you do | |
hint: not have locally. This is usually caused by another repository pushing | |
hint: to the same ref. You may want to first integrate the remote changes | |
hint: (e.g., 'git pull ...') before pushing again. | |
hint: See the 'Note about fast-forwards' in 'git push --help' for details. |