summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-10-21Merge pull request #2 from michaeldfallen/hallzy_#70Steven Hall8-120/+241
Hallzy #70
2015-10-21Fix tests broken by FETCH_TIME now being pushed inMichael Allen2-1/+5
2015-10-21Merge branch 'master' of github.com:michaeldfallen/git-radar into hallzy_#70Michael Allen7-119/+236
2015-10-21Merge pull request #82 from slackorama/feature/ditch-awkMichael Allen2-111/+114
Feature/ditch awk
2015-10-20Merge pull request #78 from jhunold/sed_fixMichael Allen1-1/+1
Escape all forward slashes
2015-10-18Since a number is no longer taken after --fetch_t we can remove the parameterSteven Hall1-2/+2
substitution that has been removed in this commit.
2015-10-18Moved comments back to original position.Steven Hall1-4/+4
2015-10-18Missed a fetch_t in the git_radar file to remove.Steven Hall1-1/+0
2015-10-18Custom Fetch time now uses a variableSteven Hall4-32/+32
Set the variable GIT_RADAR_FETCH_TIME in a bashrc, zshrc or gitradarrc file to customize the fetch time.
2015-10-16Fixed an error in my parameter subsitution.Steven Hall1-1/+1
2015-10-16Remove a awk callsSeth Mason1-2/+2
Turns out it had a bug when the branch name had a slash in it.
2015-10-16Made changes recommeneded by @michaeldfallenSteven Hall3-9/+15
in fetch.sh "if" now checks for $@ instead of just $1 in radar-base.sh there is now a parameter expansion on line 170 instead of the if statements. in git-radar, now there is a shift, and a regex check that the next value is a number. If the next value after --fetch_t is not a number, an error is echo'd and it resorts to the default behaviour of 5 minutes.
2015-10-16Merge pull request #79 from hallzy/issue69Michael Allen1-1/+11
Issue69
2015-10-16Merge pull request #80 from cbandera/feature/stash_indicatorMichael Allen6-3/+107
Feature/stash indicator
2015-10-16Merge pull request #1 from michaeldfallen/slackorama_masterSeth Mason2-118/+116
Small Bug fixes for @slackorama #74
2015-10-16Merge pull request #1 from michaeldfallen/hallzy_issue69Steven Hall1-1/+1
Switch to using %Y to get the modified time
2015-10-16Merge pull request #72 from srstevenson/fish-usage-typoMichael Allen1-1/+1
Add missing character in Fish snippet
2015-10-16Merge branch 'michaeldfallen-cbandera_stash_indicator' into ↵Claudio Bandera10-65/+634
feature/stash_indicator
2015-10-16Escape all forward slashesJürgen Hunold1-1/+1
With out the 'g' flag only the first one will be replaced. This leads to errors with branches like wip/user/hotfix.
2015-10-16Update README and include stash in customisation optionsMichael Allen2-0/+3
2015-10-16Strip spaces from the stash number (which OSX wc adds for no reason)Michael Allen1-1/+1
2015-10-16Include stash indicator in default promptMichael Allen1-2/+2
2015-10-16Hook new stash_status in to render_promptMichael Allen1-2/+12
2015-10-16Merge branch 'master' of github.com:michaeldfallen/git-radar into ↵Michael Allen9-63/+619
cbandera_stash_indicator
2015-10-16%Z returns the modified date, %Y returns the changed dateMichael Allen1-1/+1
The OSX version of stat uses %m to return the 'modified' date since epoch. The GNU version of stat doesn't have the %m format code. %Z which was being used in @hallzy's fix returns the 'changed' date since epoch, which only changes when you modify the metadata on a file. This meant that when we `touch $dot_git/.lastupdatetime` the 'changed' date doesn't change. I've switched to the %Y flag which returns the 'modified' time. This is the time that is changed when `touch` modifies the file.
2015-10-16Merge pull request #76 from inakiabt/patch-1Michael Allen1-2/+2
Fix typo on GIT_RADAR_FORMAT examples
2015-10-16That if statement wasn't doing what I thought it wasMichael Allen2-117/+115
2015-10-16Fix tests broken by old regex stringMichael Allen1-1/+1
2015-10-15Updated readme with --fetch_t feature.Steven Hall1-0/+10
2015-10-15Added feature that let's you specify how often to fetchSteven Hall3-8/+31
with --fetch_t you can specify how many seconds to wait before auto fetching. using the --fetch option gives you the default of 5 minutes still. "--fetch_t 45" for example would fetch every 45 seconds.
2015-10-15Removed unnecessary quotes.Steven Hall1-1/+1
2015-10-15Provides a fix for Isssue #69.Steven Hall1-1/+11
2015-10-15Fix typo on GIT_RADAR_FORMAT examples #65Iñaki Abete1-2/+2
2015-10-15Fix #2 branches with same name in multiple remotesSeth Mason1-4/+9
Use `git config` to get the correct upstream remote and branch when you have branch with the same name in multiple remotes (e.g. "origin/master" and "coworker/master"). Uses awk which may be a problem?
2015-10-15xargs isn't a fileMichael Allen1-0/+0
2015-10-15Merge pull request #65 from michaeldfallen/format-stringv0.4Michael Allen9-61/+380
Prompt format string
2015-10-15Some readme to show how to use the format stringMichael Allen1-12/+55
2015-10-15Support git-flow style branches by @slackoramaMichael Allen1-1/+1
2015-10-15Fix invalid regex found by @slackoramaMichael Allen1-2/+3
2015-10-15Merge branch 'master' of github.com:michaeldfallen/git-radar into format-stringMichael Allen2-0/+239
2015-10-07Further performance benchmarksMichael Allen1-0/+49
2015-10-07Performance tests on files and commitsMichael Allen1-2/+75
2015-10-07Missed a header to the tablesMichael Allen1-1/+1
2015-10-07Some basic performance tests so we can profile changesMichael Allen1-0/+109
2015-10-07Add missing character in Fish snippetScott Stevenson1-1/+1
2015-09-18timing function for performance testingMichael Allen1-0/+8
2015-09-17Added stash indicator to prompt.zshClaudio Bandera1-0/+1
2015-09-17Added documentation for stash feature.Claudio Bandera2-0/+22
2015-09-17Adapted new color and naming model.Claudio Bandera2-10/+10
2015-09-17Merge branch 'master' into feature/stash_indicatorClaudio Bandera11-137/+1052
Conflicts: prompt.bash test
cgit-1.2.3-r5 | srcnode v0.4.0