| #!/bin/env python | |
| """mergelog | |
| This is a custom merge driver for git. It should be called from git | |
| with a stanza in .git.config like this: | |
| [merge "mergelog"] | |
| name = A custom merge driver for my log.txt file. | |
| driver = ~/scripts/mergelog %O %A %B %L | |
| recursive = binary |
| // very basic embedded Ruby interpreter for C++ programs | |
| // thrown together by Jeff Trull <jetrull@sbcglobal.net> based on googling and asking questions on #ruby-lang | |
| #include <ruby.h> | |
| // access to C variables | |
| static VALUE getter(VALUE ns, VALUE var) { | |
| return Qfalse; | |
| } | |
| VALUE setter(VALUE ns, VALUE var, VALUE val) { |
| #! /bin/sh | |
| alias gs="git status" | |
| alias gc="git commit" | |
| alias gr="git checkout" | |
| alias ga="git add" | |
| alias gl="git lola" |
| [user] | |
| name = Joe User | |
| email = joe@joeuser.com | |
| [branch] | |
| autosetupmerge = true | |
| [branch "master"] | |
| remote = origin | |
| merge = refs/heads/master |
| #!/bin/sh | |
| # git-mergetool--lib is a library for common merge tool functions | |
| diff_mode() { | |
| test "$TOOL_MODE" = diff | |
| } | |
| merge_mode() { | |
| test "$TOOL_MODE" = merge | |
| } |
git config --global alias.hist "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short"
git config --global alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"
git config --global alias.mylog "log --pretty=format:'%h %s [%an]' --graph"
To check that they've been added correctly, first run git config --list. You should see something like this in the midst of all your other configuration:
alias.hist=log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
| #!/bin/sh | |
| # Convert a raw binary image into an ELF file suitable for loading into a disassembler | |
| cat > raw$$.ld <<EOF | |
| SECTIONS | |
| { | |
| EOF | |
| echo " . = $3;" >> raw$$.ld |
| #!/usr/bin/python -O | |
| ################################################################################ | |
| ################################################################################ | |
| # | |
| # State-Based Text Merging Algorithm | |
| # For 6.033 Design Project 2 | |
| # TA: Katherine Fang | |
| # 9 May 2012 | |
| # |
| """ | |
| MIT License | |
| Copyright (c) 2017 Cyrille Rossant | |
| Permission is hereby granted, free of charge, to any person obtaining a copy | |
| of this software and associated documentation files (the "Software"), to deal | |
| in the Software without restriction, including without limitation the rights | |
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| copies of the Software, and to permit persons to whom the Software is |