This grabs the last version of a file and restores it
git checkout $(git rev-list -n 1 HEAD -- "$file")^ -- "$file"
| # Config settings for memcache servers | |
| defaults: &DEFAULTS | |
| memcache_prefix: 'aaabbbcccddd' | |
| memcache_servers: | |
| - '127.0.0.1' | |
| development: | |
| <<: *DEFAULTS |
| import java.util.Scanner; | |
| public class Convert | |
| { | |
| public static void main(String[] args) | |
| { | |
| //allowing us to take input from the keyboard | |
| Scanner keyboard = new Scanner(System.in); | |
| //delcaring variables |
| class Mary { | |
| // This is a variable storing the current age | |
| int age = 0; | |
| int weight = 100; | |
| // This is a method to increment the current age variable by the amount passed in | |
| function increaseAge(int amount) { | |
| age = age + amount; | |
| } |
| So this should make the first part of the query in the code return nothing and it will be unioned with the second hand which should return bob's user id, my password_hash, and my salt value. | |
| ' UNION select id, '<USE VAL FROM PY BELOW>', 'test' from users where username='bob'; -- | |
| #!/usr/bin/env python | |
| import hashlib | |
| import json | |
| import logging |
| Failures: | |
| 1) Testable::ApidController should return a successful response | |
| Failure/Error: get '/testable/apid' | |
| Errno::ECONNREFUSED: | |
| Connection refused - connect(2) | |
| # ./lib/apid/old_apid.rb:16:in `request' | |
| # ./lib/apid/generic_apid.rb:11:in `generic' | |
| # ./app/controllers/testable/apid_controller.rb:3:in `index' | |
| # ./config/initializers/quiet_assets.rb:6:in `call_with_quiet_assets' |
| TERMAHRER, ERND TERMAHRER, ERND TERMAHRER CRERPS ERN THERS PERTER PERC FRERM DER TER DER T DA LERST | |
| SERLERBL ERF RERCERDERD TERMAH ERND ERL ER YERSTERDERS HERV LERGHTERD FERLS TH WER TER DERSTER DERTH. | |
| ERT, ERT, BRERF CERNDLER LERFERS BERT A WERLKIN SHERDER, A PER PLER THERT STRERTS ERND FRERTS HERS HER | |
| ERPERN DA STERGER ERND THERN ERS HERD NER MAHR. ERT ERS A TERLER TERLD BER ERN ERDERT, FERL ERF SERND | |
| ERND FERER SERGNERFIN NERTHIN. |