Mark Renouf mrenouf
otobrglez
/ adb-completion.bash
Created
November 27, 2013 15:26
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
| # /* vim: set ai ts=4 ft=sh: */ | |
| # | |
| # Copyright 2011, The Android Open Source Project | |
| # | |
| # Licensed under the Apache License, Version 2.0 (the "License"); | |
| # you may not use this file except in compliance with the License. | |
| # You may obtain a copy of the License at | |
| # | |
| # http://www.apache.org/licenses/LICENSE-2.0 | |
| # |
mrenouf
/ git_merge_meld.sh
Created
September 28, 2011 10:09
Merge helper script for using 'git mergetool' with meld, fixes http://stackoverflow.com/questions/7501666/
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
| #!/bin/bash | |
| # Handles proper use of Meld from Git. | |
| # | |
| # Instead of launching meld with $MERGED as the base revision, this | |
| # script makes a copy of $BASE and handles copying the result back | |
| # to $MERGED if the result was saved. | |
| # As an extra tweak, it also presents branch names (if known) as | |
| # the file name prefix, instead of just "LOCAL" and "REMOTE". |
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/python | |
| import sys, subprocess | |
| def main(args=sys.argv): | |
| if len(args) < 2: | |
| print "Usage: %s <command>" % (args[0]) | |
| exit 1 | |
| while True: | |
| try: line = raw_input(None) |