Commit Graph

  • ac354161b6 Merge pull request #205 from keras/magicmaster Martin Gondermann 2015-11-02 11:14:58 +0100
  • f9340cee17 use `test -v` to allow overriding defaults with empty strings mikael 2015-11-02 11:17:19 +0200
  • c673ea84cf Merge pull request #204 from ogr3/shebang-line Martin Gondermann 2015-10-30 14:40:02 +0100
  • 16d7bf93ad Removed old comments oGre 2015-10-29 20:11:34 +0100
  • e0769122da Added shebang line oGre 2015-10-29 20:03:02 +0100
  • 40f2d1b1ce Merge pull request #201 from ogr3/ubuntu-themes-cleanup Martin Gondermann 2015-10-20 11:07:26 +0200
  • c2fa630f1b Merge pull request #198 from asazello/master Martin Gondermann 2015-10-20 11:06:24 +0200
  • cb267fca65 Merge pull request #197 from ogr3/single-lite-theme-fix Martin Gondermann 2015-10-20 11:05:58 +0200
  • 61606eb5f9 Merge pull request #196 from ogr3/simplified-old-status Martin Gondermann 2015-10-20 11:05:37 +0200
  • 57279738f1 Tweaked Ubuntu versions of fonts to only override the symbols from Default that are needed. Added Ubuntu versions of the TruncatedPwd_WindowTitle theme. oGre 2015-10-19 19:24:20 +0200
  • eb8e281667 A space was missing. Asazello 2015-10-18 09:50:16 +1100
  • 7ee135e1de Themes overriding define_undefined_git_prompt_colors needs the new variables oGre 2015-10-17 23:01:11 +0200
  • 8894a5f84a Simplified old gitstatus, eliminating a git command if no upstream branch is found oGre 2015-10-17 22:12:52 +0200
  • 21992de10b Merge pull request #195 from ogr3/themes-cleanup Martin Gondermann 2015-10-16 08:24:30 +0200
  • 33c56e492b Merge pull request #194 from ogr3/old-gitstatus-bugfix Martin Gondermann 2015-10-16 08:23:53 +0200
  • 86a92caa1c Merge pull request #193 from asazello/master Martin Gondermann 2015-10-16 08:23:22 +0200
  • 62496416cd Cleanup of themes, adding the new upstream variables where applicable oGre 2015-10-16 07:54:06 +0200
  • 8ac89e8e26 Bugfix - reverted command to check if in repo and extract branch. Now works for tags and commit checkouts oGre 2015-10-16 07:48:44 +0200
  • d431610689 Fix for Single_line_Ubuntu.bgptheme Asazello 2015-10-16 11:41:23 +1100
  • 12e4de13bb Merge pull request #190 from hiukkanen/master Martin Gondermann 2015-10-14 21:43:41 +0200
  • 22d5591af4 Merge pull request #192 from ogr3/environment-fix Martin Gondermann 2015-10-14 21:43:11 +0200
  • f0dea79027 Updated documentation. Let GIT_PROMPT_STATUS_COMMAND be set outside a theme before loading gitprompt.sh oGre 2015-10-14 21:23:49 +0200
  • c6e9984135 Use portable shebang Joni Lahtinen 2015-10-14 21:03:12 +0300
  • a1c94fc64c Merge pull request #189 from ogr3/display-upstream-branch Martin Gondermann 2015-10-14 19:27:21 +0200
  • d494105623 Merge pull request #188 from gullevek/master Martin Gondermann 2015-10-14 19:25:49 +0200
  • 107514959d Replaced all remaining backticks oGre 2015-10-14 17:10:11 +0200
  • d104f75b22 shell for gitprompt.sh needs to be bash Clemens Schwaighofer 2015-10-14 19:25:04 +0900
  • 7f4d122fd2 Merge remote-tracking branch 'magicmonty/master' Clemens Schwaighofer 2015-10-14 17:41:58 +0900
  • b84215df4f Fixed bug in determining branch when detached oGre 2015-10-14 10:27:54 +0200
  • 801d45605b Cleanup oGre 2015-10-14 08:56:03 +0200
  • 4a84143502 Bugfix oGre 2015-10-14 08:34:02 +0200
  • a266d2967d Added support for showing upstream tracking branch in older gitstatus oGre 2015-10-14 08:18:30 +0200
  • 752701797d Merge with upstream master oGre 2015-10-14 08:16:14 +0200
  • e7fa9319be Merge pull request #185 from ogr3/old-git-status Martin Gondermann 2015-10-14 06:40:14 +0200
  • b72c7678e9 Merge pull request #186 from ogr3/untracked-files-bug Martin Gondermann 2015-10-14 06:39:18 +0200
  • 67e7d6a08b Fixed bug where not all untracked files in folders were shown oGre 2015-10-13 18:43:44 +0200
  • 52bfba7d37 Added documentation in Default theme oGre 2015-10-13 18:31:49 +0200
  • 50ee0e5fc9 Backported the new way of counting stashed files and the printf function to speed it up oGre 2015-10-13 18:24:57 +0200
  • 09c98facb6 Added environment variable GIT_PROMPT_STATUS_COMMAND that can point out a custom gitstatus.sh script if needed. oGre 2015-10-13 12:59:05 +0200
  • 47f4aca1f8 Added environment variable GIT_PROMPT_STATUS_COMMAND that can point out a custom gitstatus.sh script if needed. oGre 2015-10-13 12:53:10 +0200
  • 41aa8fe825 Unset the new variable. Documentation added in README.md Removed unexpected token warning. oGre 2015-10-08 20:31:52 +0200
  • 87ecc3cae9 Documentation oGre 2015-10-08 17:32:33 +0200
  • baa54d3673 Added config variable analogue to GIT_PROMPT_VIRTUALENV oGre 2015-10-08 17:30:43 +0200
  • 54543440f5 Add upstream tracked branch to gitstatus.sh and possible to show in prompt oGre 2015-10-08 15:39:07 +0200
  • c9e576b961 Merge pull request #183 from ogr3/updated-documentation Martin Gondermann 2015-10-07 14:14:55 +0200
  • 7edc0233fe Updated documentation oGre 2015-10-06 17:36:52 +0200
  • 828930178b Merge pull request #182 from ogr3/set-window-title Martin Gondermann 2015-10-06 15:18:32 +0200
  • fbeaa6effd Moved gp_truncate_pwd function to gitprompt.sh oGre 2015-10-06 08:55:18 +0200
  • ff48c81587 Minor fix oGre 2015-10-05 18:29:04 +0200
  • 1ba48fd06b Added helper function gp_set_window_title that can be used to set XTerm window title to the given argument. Used in TruncatedPwd_WindowTitle theme oGre 2015-10-05 18:27:13 +0200
  • f833e59438 Merge pull request #181 from ogr3/python-cleanup Martin Gondermann 2015-10-05 08:00:23 +0200
  • 55becdb193 Minor reformatting oGre 2015-10-05 07:11:57 +0200
  • 1170818d04 Refactored get tag or hash to work as the bash version oGre 2015-10-04 21:46:39 +0200
  • dd324dcdb2 Re-format, moved imports, fixed spelling error oGre 2015-10-04 20:56:19 +0200
  • bbe02ddce9 Merge pull request #180 from ogr3/disable-venv-prompt Martin Gondermann 2015-10-02 21:17:43 +0200
  • 4f6c446220 Merge pull request #179 from ogr3/dots-fix Martin Gondermann 2015-10-02 21:17:23 +0200
  • 149efc1331 Virtualenv information duplicated code moved to helper function oGre 2015-10-02 08:33:20 +0200
  • 26bd9fb354 Honor VIRTUAL_ENV_DISABLE_PROMPT in updatePrompt as well oGre 2015-10-02 07:10:33 +0200
  • ba1276e9c8 Honor VIRTUAL_ENV_DISABLE_PROMPT, if it is set to non-empty string oGre 2015-10-01 21:56:14 +0200
  • ca7a848ca4 Renamed array variable to _fields to comply with the other arrays oGre 2015-09-30 16:34:09 +0200
  • ed44f6bc9d Merge pull request #1 from pedantic79/simple-dots-fix ogr3 2015-09-30 06:53:40 +0200
  • dedb19180b fix issue with parsing ahead/behind Dan Nguyen 2015-09-29 18:10:16 -0500
  • fc6d4d87e7 Merge remote-tracking branch 'ogr3/dots-fix' into simple-dots-fix Dan Nguyen 2015-09-29 15:52:34 -0500
  • 73f3cb75d1 Handle branches with dots in them Dan Nguyen 2015-09-29 15:44:25 -0500
  • d4b630bf7d Possible to have dots in branch name oGre 2015-09-29 17:00:14 +0200
  • 5098924db8 Merge pull request #177 from ogr3/theme-optimized Martin Gondermann 2015-09-29 08:20:35 +0200
  • f1940dfe8b Quoted paths to handle spaces in them oGre 2015-09-28 22:14:48 +0200
  • f319f3acc1 Added break in loop after we find the current theme oGre 2015-09-28 21:29:39 +0200
  • 2e0180f93a Removed backtick from comment oGre 2015-09-28 18:33:11 +0200
  • 09fcaf22fc Optimized theme reading to not use external commands, but only bash oGre 2015-09-28 18:23:05 +0200
  • 1952c2c86c Merge pull request #162 from ogr3/theme-fix Martin Gondermann 2015-09-28 08:48:09 +0200
  • c6b12da650 Merge branch 'theme-fix' of github.com:ogr3/bash-git-prompt into theme-fix oGre 2015-09-28 07:09:42 +0200
  • 249c24e279 Two functions missed. oGre 2015-09-28 07:05:59 +0200
  • 8cd60a61da Merge branch 'master' of https://github.com/magicmonty/bash-git-prompt into theme-fix oGre 2015-09-28 07:06:34 +0200
  • 1603b30f71 Fixes error on freshly initialized repository Martin Gondermann 2015-09-27 23:11:18 +0200
  • 1b31e33d93 Merge pull request #176 from pedantic79/porcelain Martin Gondermann 2015-09-27 22:45:02 +0200
  • e10ecb4139 Merge branch 'porcelain-no-wc' into porcelain Dan Nguyen 2015-09-27 15:37:36 -0500
  • 4054bff03d Merge pull request #170 from pedantic79/porcelain Martin Gondermann 2015-09-27 22:30:59 +0200
  • 1786764bc1 Remove use of wc Dan Nguyen 2015-09-27 11:53:42 -0500
  • 5293850880 Merge pull request #9 from ogr3/porcelain-sed pedantic79 2015-09-27 11:50:03 -0500
  • 89acb1c4b0 Changed to match tabs and spaces oGre 2015-09-27 18:43:30 +0200
  • c279c77fd8 Resolved conflict oGre 2015-09-27 18:14:52 +0200
  • 5cbd877fe5 Merge pull request #7 from ogr3/porcelain-tag pedantic79 2015-09-25 16:31:03 -0500
  • 5fe390d098 Fixed bug in stash parsing oGre 2015-09-25 22:28:40 +0200
  • a2906f4411 Merge pull request #6 from ogr3/porcelain-tag pedantic79 2015-09-25 13:40:25 -0500
  • 3621b5a67c We set branch first, then remote oGre 2015-09-25 19:41:07 +0200
  • 5b82a33b4f Merge pull request #5 from ogr3/porcelain-tag pedantic79 2015-09-25 12:08:27 -0500
  • c5cac48f4d Initial commit on is always a local state - set no remote tracking oGre 2015-09-25 12:59:48 +0200
  • b989b7f324 Able to parse tag names when on tag oGre 2015-09-25 12:30:29 +0200
  • 589106d420 Merge pull request #4 from ogr3/porcelain-no-remote pedantic79 2015-09-25 00:43:41 -0500
  • 9955edb5c3 Check for local branch needs to be moved so that check for behind/after doesn't override the result oGre 2015-09-25 07:22:52 +0200
  • b50cc5cb0d Merge remote-tracking branch 'ogr3/porcelain-cleanup' into porcelain Dan Nguyen 2015-09-24 11:30:05 -0500
  • db6f219553 Reorder AHEAD and BEHIND Dan Nguyen 2015-09-24 10:40:18 -0500
  • 87c66ea8d1 Missed one oGre 2015-09-24 17:28:20 +0200
  • 0e48e020b8 Remove unnecessary grep line Dan Nguyen 2015-09-24 09:54:02 -0500
  • 750425d841 Changed all backticks to oGre 2015-09-24 08:33:06 +0200
  • 0e6b70f8e3 Merge branch 'porcelain-remove-grep' into porcelain Dan Nguyen 2015-09-24 09:11:54 -0500
  • 220d5c22b1 Fix parsing when both ahead and behind Dan Nguyen 2015-09-24 09:08:27 -0500
  • 606388df39 Fix behind parsing Dan Nguyen 2015-09-23 20:05:13 -0500
  • 01f5402c77 Fix behind parsing Dan Nguyen 2015-09-23 20:05:13 -0500