Assuming you are sitting on that commit
git reset --hard HEAD~1
Or
ּ_בּ | |
בּ_בּ | |
טּ_טּ | |
כּ‗כּ | |
לּ_לּ | |
מּ_מּ | |
סּ_סּ | |
תּ_תּ | |
٩(×̯×)۶ | |
٩(̾●̮̮̃̾•̃̾)۶ |
######################################### | |
# Very basic rack application showing how to use a router based on the uri | |
# and how to process requests based on the HTTP method used. | |
# | |
# Usage: | |
# $ rackup rack_example.ru | |
# | |
# $ curl -X POST -d 'title=retire&body=I should retire in a nice island' localhost:9292/ideas | |
# $ curl -X POST -d 'title=ask Satish for a gift&body=Find a way to get Satish to send me a gift' localhost:9292/ideas | |
# $ curl localhost:9292/ideas |
diff --git a/autoload/Powerline/Matches.vim b/autoload/Powerline/Matches.vim | |
index 2244f57..98d9cde 100644 | |
--- a/autoload/Powerline/Matches.vim | |
+++ b/autoload/Powerline/Matches.vim | |
@@ -2,6 +2,7 @@ let g:Powerline#Matches#matches = { | |
\ 'command_t' : Pl#Match#Add('bufname("%")', 'GoToFile'), | |
\ 'ft_help' : Pl#Match#Add('&ft' , 'help'), | |
\ 'ft_man' : Pl#Match#Add('&ft' , 'man'), | |
+ \ 'ft_nerdtree' : Pl#Match#Add('&ft' , 'nerdtree'), | |
\ 'ft_qf' : Pl#Match#Add('&ft' , 'qf'), |
# GistID: 2304197 | |
# Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs) | |
defaults write NSGlobalDomain AppleKeyboardUIMode -int 3 | |
# Enable subpixel font rendering on non-Apple LCDs | |
defaults write NSGlobalDomain AppleFontSmoothing -int 2 | |
# Enable the 2D Dock | |
defaults write com.apple.dock no-glass -bool true |
# Hacky random image thumbnailer. | |
# by Peter Sobot, April 21, 2012 | |
# Based heavily on code by Michael Macias | |
# (https://gist.github.com/a54cd41137b678935c91) | |
require 'rmagick' | |
images = Dir.glob(ARGV[0] ? ARGV[0] | |
: '-default-input-paths-') | |
output_dir = (ARGV[1] ? ARGV[1] |
var user = { | |
validateCredentials: function (username, password) { | |
return ( | |
(!(username += '') || username === '') ? { error: "No Username Given.", field: 'name' } | |
: (!(username += '') || password === '') ? { error: "No Password Given.", field: 'pass' } | |
: (username.length < 3) ? { error: "Username is less than 3 Characters.", field: 'name' } | |
: (password.length < 4) ? { error: "Password is less than 4 Characters.", field: 'pass' } | |
: (!/^([a-z0-9_-]+)$/i.test(username)) ? { error: "Username contains invalid characters.", field: 'name' } | |
: false | |
); |
Until last night I lived in fear of tildes, carats, resets and reverts in Git. I cargo culted, I destroyed, I laid waste the tidy indicies, branches and trees Git so diligently tried to maintain. Then Zach Holman gave a talk at Paperless Post. It was about Git secrets. He didn't directly cover these topics but he gave an example that made me realize it was time to learn.
Generally, when I push out bad code, I panic, hit git reset --hard HEAD^
, push and clean up the pieces later. I don't even really know what most of that means. Notational Velocity seems to be fond of it ... in that I just keep copying it from Notational Velocity and pasting it. Turns out, this is dumb. I've irreversibly lost the faulty changes I made. I'll probably even make the same mistakes again. It's like torching your house to get rid of some mice.
Enter Holman. He suggests a better default undo. git reset --soft HEAD^
. Says it stag
<html> | |
<head> | |
<meta charset="utf-8"> | |
<link rel="stylesheet" href="http://code.jquery.com/ui/1.8.20/themes/base/jquery-ui.css" type="text/css" media="all" /> | |
<link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" /> | |
<style> | |
body { font-size: 62.5%; } | |
label, input { display:block; } | |
input.text { margin-bottom:12px; width:95%; padding: .4em; } | |
fieldset { padding:0; border:0; margin-top:25px; } |