summaryrefslogtreecommitdiffstats
path: root/git-base.sh (follow)
AgeCommit message (Collapse)AuthorFilesLines
2015-08-06Provide example of local commit differenceMichael Allen1-0/+26
2015-08-06Provide colors for bash as well as ZshMichael Allen1-0/+36
2015-08-02Include color prefixes in zsh status promptMichael Allen1-4/+4
2015-08-02Fixed missing staged and unstaged modifications caseMichael Allen1-2/+2
2015-07-24remove colors and use them in a function so that it isn't tied down to ZSHMichael Allen1-5/+36
2015-07-23provide the ability to surround letter in a status with a colorMichael Allen1-2/+2
2015-07-23remove unnecessary added/modified/etcMichael Allen1-19/+21
2015-07-21cleaned up the status line issues and provided tests for themMichael Allen1-15/+26
2015-06-21simplified the commit comparison functionsMichael Allen1-32/+4
2015-06-03fixed issue with branches that contain other branch namesMichael Allen1-1/+1
When a remote branch begins with or ends with the local branch name then the commits against diff functions can report the commits for the remote branch instead of your local branch, e.g.: I have local branch `foo` with 1 commit ahead of master and a remote branch `foobar` with 2 ahead of master. The prompt will report 2 commits instead of the true 1 commit because the `grep $branch_name` returns the `foobar` branch. Simple fix is to ensure we grep for the full `/<branch_name>$` so: branch_name = `foo` `origin/foo` matches `other/foo` matches `origin/foobar` doesn't match `origin/barfoo` doesn't match
2015-05-07cleanly support repos with no master to trackMichael Allen1-4/+12
2015-03-10didn't silence properlyMichael Allen1-3/+3
2015-03-10typoMichael Allen1-3/+3
2015-03-10clean code and silence git callsMichael Allen1-17/+4
2015-03-10list files from the root, not current dirMichael Allen1-1/+1
2015-03-10try to tell if a dir is dirtyMichael Allen1-0/+46
2015-03-09prevent bad grep usage when no branch_nameMichael Allen1-6/+8
2015-03-09revert to grepping as when two remote branches are up to one commit things ↵Michael Allen1-2/+2
get weird
2015-03-09ensure remote_branch_name is fails quietlyMichael Allen1-1/+1
2015-03-09quieten fatal remote_branch_name callsMichael Allen1-1/+2
2015-03-09remove unnecessary is_repo checksMichael Allen1-16/+12
2015-03-09sped up remote_branch_name by not needing to call branch_nameMichael Allen1-1/+1
2015-03-02speed up remote_behind/ahead by not checking if tracking = remoteMichael Allen1-2/+4
2015-03-02add a sh file for calling the fetchMichael Allen1-4/+0
I tried many ways to get the fetch call to background without staying attached to the current subshell. Ends up it's not possible to nohup or fully disown a function that is defined inside the same file that's calling it. So simple answer, I've created a file `fetch.sh` that can be called inside nohup. It will source `git-base.sh` and call the fetch function.
2015-03-01provide a default for remote_branch_name so we can be fasterMichael Allen1-4/+4
2015-02-27remove dead is_tracking_remote functionMichael Allen1-8/+0
2015-02-27optmise commits against functions by not checking if_tracking_remoteMichael Allen1-8/+12
2015-02-23force more work into background taskMichael Allen1-5/+5
2015-02-23quieten the git fetch callMichael Allen1-1/+1
2015-02-23quieten the stat callMichael Allen1-1/+1
2015-02-23fixed bad math and added recording the timestamp when we fetchMichael Allen1-8/+3
2015-02-23default timestamp to 0 if no recorded timestampMichael Allen1-2/+6
2015-02-22remove trailing whitespaceMichael Allen1-10/+10
2015-02-22faster files status stringsMichael Allen1-35/+71
2015-02-18status is a readonly variable in zshMichael Allen1-2/+2
2015-02-18caught copypasta mistakeMichael Allen1-11/+11
2015-02-18handle detached heads cleanlyMichael Allen1-3/+26
2015-02-17add functions for conflicted changesMichael Allen1-0/+18
2015-02-17add functions to show staged changesMichael Allen1-4/+23
2015-02-17untracked files reportingMichael Allen1-0/+12
2015-02-17apparent syntax errorMichael Allen1-1/+1
2015-02-16functions to get the commit difference between the branch on the remote and ↵Michael Allen1-0/+26
the master
2015-02-12find branch names and commits ahead or behindMichael Allen1-0/+54
2015-02-11turning some tests into proper shunit tests and found a few bugsMichael Allen1-5/+3
2015-02-06don't let functions complain if we aren't in a git repomichaeldfallen1-16/+51
2015-02-05orchestrate async fetchingmichaeldfallen1-0/+65