update gitconfig and lldbinit

This commit is contained in:
Sami Samhuri 2015-12-19 16:46:59 -08:00
parent bf78f7ca68
commit 36619adadd
2 changed files with 4 additions and 0 deletions

View file

@ -50,3 +50,6 @@
clean = git hawser clean %f clean = git hawser clean %f
smudge = git hawser smudge %f smudge = git hawser smudge %f
required = true required = true
[merge "mergepbx"]
name = XCode project files merger
driver = mergepbx %O %A %B

View file

@ -3,3 +3,4 @@ command alias online expr [[FakeOffline sharedInstance] goOnline]
command alias uikit expr @import UIKit command alias uikit expr @import UIKit
command alias foundation expr @import Foundation command alias foundation expr @import Foundation
command regex rd 's/^[[:space:]]*$/po [[[UIApplication sharedApplication] keyWindow] recursiveDescription]/' 's/^(.+)$/po [%1 recursiveDescription]/' command regex rd 's/^[[:space:]]*$/po [[[UIApplication sharedApplication] keyWindow] recursiveDescription]/' 's/^(.+)$/po [%1 recursiveDescription]/'
command alias altrace po [[UIWindow keyWindow] _autolayoutTrace]