This should be one of the core features of Git, but for some reason it's impossible to figure out how to search for a string in your commit history and see the diffs that that string is in. Here's the best I've come up with:
To find which commits and which files a string was added or removed in:
git log -S'search string' --oneline --name-status
To see the diff of that
| #!/bin/bash -e | |
| function merge_repo_to_subdir { | |
| local url=$1 | |
| local commit=$2 | |
| local module_path=$3 | |
| if [[ -z $url || -z $commit || -z $module_path ]]; then | |
| echo "Usage: merge-repo-to-subdir.sh URL BRANCH PATH" >&2 | |
| exit 1 |
These are my notes basically. At first i created this gist just as a reminder for myself. But feel free to use this for your project as a starting point. If you have questions you can find me on twitter @thomasf https://twitter.com/thomasf This is how i used it on a Debian Wheezy testing (https://www.debian.org/releases/testing/)
Discuss, ask questions, etc. here https://news.ycombinator.com/item?id=7445545
| #!/usr/bin/env python | |
| # -*- coding: utf-8 -*- | |
| from __future__ import unicode_literals | |
| def fuzzy_match_simple(pattern, instring): | |
| """Return True if each character in pattern is found in order in instring. | |
| :param pattern: the pattern to be matched | |
| :type pattern: ``str`` |
| from collections import OrderedDict | |
| from ctypes import sizeof | |
| from ctypes.wintypes import ( | |
| DWORD, | |
| LONG, | |
| WORD, | |
| ) | |
| import pygame | |
| from win32clipboard import ( |
| <job> | |
| <runtime> | |
| <description>A non-interactive web retriever script. | |
| Copyright (c) Atif Aziz. All rights reserved. | |
| Written by Atif Aziz, http://www.raboof.com/ | |
| Creative Commons Attribution-ShareAlike 3.0 Unported License. | |
| http://creativecommons.org/licenses/by-sa/3.0/ | |
| </description> |
| #!/usr/bin/env python3 | |
| import struct | |
| import re | |
| class Wad(object): | |
| """Encapsulates the data found inside a WAD file""" | |
| def __init__(self, wadFile): | |
| """Each WAD files contains definitions for global attributes as well as map level attributes""" |
I like Learn You a Haskell as a reference and cheat-sheet but I found it a little slow for learning Haskell.
Here's my recommended order for just learning Haskell:
http://www.seas.upenn.edu/~cis194/lectures.html Brent Yorgey's course is the best I've found so far and replaces both Yann Esposito's HF&H and the NICTA course. This course is particularly valuable as it will not only equip you to write Haskell but also help you understand parser combinators.
Real World Haskell is available online. (Thanks bos!)
I recommend RWH as a reference (thick book). The chapters for parsing and monads are great for getting a sense for where monads are useful. Other people have said that they've liked it a lot. Perhaps a good follow-up for practical idioms after you've got the essentials of Haskell down?
Using Python's built-in defaultdict we can easily define a tree data structure:
def tree(): return defaultdict(tree)That's it!
| from Tkinter import * | |
| root = Tk() | |
| w = Label(root, text="Hello, world!") | |
| root.overrideredirect(True) | |
| root.geometry("{0}x{1}+0+0".format(root.winfo_screenwidth(), root.winfo_screenheight())) | |
| root.focus_set() # <-- move focus to this widget | |
| root.bind("<Escape>", lambda e: e.widget.quit()) | |
| w.pack() |