stonewareslord/omg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1 from fcamblor/log-oneline-fix

Browse Source 
Added --pretty=oneline to `git log`
This commit is contained in:
Arialdo Martini 2013-09-11 10:39:05 -07:00
commit fa7c155b11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prompt.sh
View File

@ -101,8 +101,8 @@ function build_prompt {
can_fast_forward=false
can_fast_forward=false
commits_ahead=$(git log --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^<" )
commits_behind=$(git log --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^>" )
commits_ahead=$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^<" )
commits_behind=$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^>" )
if [ ${commits_ahead} -gt 0 -a ${commits_behind} -gt 0 ];
then