madhikarma

# Merge Script
 
# http://code.hootsuite.com/an-introduction-to-creating-and-distributing-embedded-frameworks-in-ios/

# 1
# Set bash script to exit immediately if any commands fail.
set -e
 
# 2
# Setup some constants for use later on.

cloudwu

diff --git a/src/lapi.c b/src/lapi.c
index d011431..a4fce7f 100644
--- a/src/lapi.c
+++ b/src/lapi.c
@@ -993,6 +993,63 @@ LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
   return status;
 }
 
+static Proto *
+cloneproto (lua_State *L, const Proto *src) {

matej

//
//  CALayer+MBAnimationPersistence.h
//
//  Created by Matej Bukovinski on 19. 03. 14.
//  Copyright (c) 2014 Matej Bukovinski. All rights reserved.
//

#import <QuartzCore/QuartzCore.h>

emiller

#!/bin/bash
#
# git-mv-with-history -- move/rename file or folder, with history.
#
# Moving a file in git doesn't track history, so the purpose of this
# utility is best explained from the kernel wiki:
#
#   Git has a rename command git mv, but that is just for convenience.
#   The effect is indistinguishable from removing the file and adding another
#   with different name and the same content.

kyleturner

To remove a submodule you need to:

Delete the relevant line from the .gitmodules file.
Delete the relevant section from .git/config.
Run git rm --cached path_to_submodule (no trailing slash).
Commit and delete the now untracked submodule files.