aalvarado

# Probaby windows with msys (old times)
alias ls='ls -A --color=yes'
alias dir='ls -A --color=yes'
alias vi='vim'
alias gb='git branch'
alias gba='git branch -a'
alias gc='git commit -v'
alias gfu='git fetch upstream master:upstream'
alias gf='git fetch origin master:remote-master'
alias gp='git push'

aalvarado

#!/bin/sh
function parse_git_branch {
  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
}

current_branch=$(parse_git_branch)

if [[ -n "$current_branch" ]]; then
	 git fetch -v upstream
	 git checkout master

aalvarado

/*
sources: 
	http://www.justatheory.com/computers/programming/javascript/emulating_namespaces.html
	http://www.dustindiaz.com/namespace-your-javascript/
	http://www.crockford.com/javascript/private.html
	http://yuiblog.com/blog/2007/06/12/module-pattern/
	http://stackoverflow.com/questions/881515/javascript-namespace-declaration

*/

aalvarado

class FilePosition:
	
	def __init__(self, bufferId):
		self.bufferId = bufferId #sets the bufferId
		self.filePositions = [] # where the modified lines will be stored
		self.lastPos = 0
		self.counter = 0

	def addFilePosition(self, pos):
		self._findDelete(pos) # checks if the line number is already in the list