-
Notifications
You must be signed in to change notification settings - Fork 395
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge project with maintained version #133
base: master
Are you sure you want to change the base?
Commits on May 25, 2018
-
- Implement possible fix for git 2.17 issue with string case. Suggested a better fix for later. - Implemented python stashed support. Is this in Haskell version? Will have to check. - Reorganized zshrc.sh to be a bit clearer. Few changes such as theme and formatting to align with bash-git-prompt. - Small tidy up to the README.
Configuration menu - View commit details
-
Copy full SHA for f166fba - Browse repository at this point
Copy the full SHA f166fbaView commit details -
- All commands checked for bad return. No longer need stderr connected.
Configuration menu - View commit details
-
Copy full SHA for 56f0358 - Browse repository at this point
Copy the full SHA 56f0358View commit details -
FIX: Prompt was not displaying.
- Issue was a simple typo in zshrc.sh - Revert gitstatus.py to printing on line.
Configuration menu - View commit details
-
Copy full SHA for 684d615 - Browse repository at this point
Copy the full SHA 684d615View commit details -
FIX: Regression, unhandled exception.
- Really need to get some tests to help cover this.
Configuration menu - View commit details
-
Copy full SHA for 3a5dec4 - Browse repository at this point
Copy the full SHA 3a5dec4View commit details -
Configuration menu - View commit details
-
Copy full SHA for dca58dc - Browse repository at this point
Copy the full SHA dca58dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e86fd8 - Browse repository at this point
Copy the full SHA 7e86fd8View commit details
Commits on May 26, 2018
-
FIX: #6 Examine compute_ahead_behind, discrepancy
- Simple logic problem was the root. - Update gitignore, mainly usual python test dirs and stack's dirs.
Configuration menu - View commit details
-
Copy full SHA for e245593 - Browse repository at this point
Copy the full SHA e245593View commit details -
Basic tox configuration to test gitstatus.py
- Will check for style issues and run unit tests.
Configuration menu - View commit details
-
Copy full SHA for ee1c4c3 - Browse repository at this point
Copy the full SHA ee1c4c3View commit details -
- FIX: Prompt was not showing when detached HEAD. - BUG: pytest fails from tox, will investigate.
Configuration menu - View commit details
-
Copy full SHA for 7d138e9 - Browse repository at this point
Copy the full SHA 7d138e9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3e6db1a - Browse repository at this point
Copy the full SHA 3e6db1aView commit details
Commits on May 27, 2018
-
- Tox env has no configured user information. - Generate work folders from tempfile.
Configuration menu - View commit details
-
Copy full SHA for 3269438 - Browse repository at this point
Copy the full SHA 3269438View commit details -
Implement travis build for python
- Test on 2.7, 3.4, 3.5, 3.6. - 3.2, 3.3 should work but getting excessive. - 2.6.x and 3.1.x are unsupported based on code at this time.
Configuration menu - View commit details
-
Copy full SHA for a877603 - Browse repository at this point
Copy the full SHA a877603View commit details -
Configuration menu - View commit details
-
Copy full SHA for f78f234 - Browse repository at this point
Copy the full SHA f78f234View commit details
Commits on May 28, 2018
-
FIX: #3 Show [master L] when branch local only.
- Simple suffix to branch name. Will appear if detached is local too. - Travis locked to master build.
Configuration menu - View commit details
-
Copy full SHA for 4766cdf - Browse repository at this point
Copy the full SHA 4766cdfView commit details -
- Remove all need for commands except for: git status --branch --porcelain - Parse porcelain capture status for repo's staged/unstaged changes. - Parse porcelain capture for difference from remote if set. - Fetch stash number and hash directly from files in .git - Now parsing upstream name, can be set on prompt at later date when changes facilitate.
Configuration menu - View commit details
-
Copy full SHA for 10d8a9c - Browse repository at this point
Copy the full SHA 10d8a9cView commit details -
Configuration menu - View commit details
-
Copy full SHA for e93f615 - Browse repository at this point
Copy the full SHA e93f615View commit details -
FIX: #12 Speedup by taking input from STDIN
- When no stdin detected, fallback to running own command.
Configuration menu - View commit details
-
Copy full SHA for fba5070 - Browse repository at this point
Copy the full SHA fba5070View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6fda93e - Browse repository at this point
Copy the full SHA 6fda93eView commit details
Commits on May 29, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 6e401d9 - Browse repository at this point
Copy the full SHA 6e401d9View commit details
Commits on May 30, 2018
-
Configuration menu - View commit details
-
Copy full SHA for bd26fbb - Browse repository at this point
Copy the full SHA bd26fbbView commit details -
FIX: #13 Find root of active git project
- Script aware now if in worktree or not, no visual difference in prompt at this point.
Configuration menu - View commit details
-
Copy full SHA for 87774a8 - Browse repository at this point
Copy the full SHA 87774a8View commit details
Commits on May 31, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 2b1069b - Browse repository at this point
Copy the full SHA 2b1069bView commit details -
Configuration menu - View commit details
-
Copy full SHA for f2ca95e - Browse repository at this point
Copy the full SHA f2ca95eView commit details
Commits on Jun 2, 2018
-
Configuration menu - View commit details
-
Copy full SHA for c6f3567 - Browse repository at this point
Copy the full SHA c6f3567View commit details -
Configuration menu - View commit details
-
Copy full SHA for 814dc53 - Browse repository at this point
Copy the full SHA 814dc53View commit details
Commits on Jun 4, 2018
-
FIX #16: Reset color in prefix
- Ensure consistent colouring by using resets around output.
Configuration menu - View commit details
-
Copy full SHA for e02d4b1 - Browse repository at this point
Copy the full SHA e02d4b1View commit details -
FIX #17: handle repo lacking initial commit
- Increase function purity by reducing global usage.
Configuration menu - View commit details
-
Copy full SHA for 4e45c4f - Browse repository at this point
Copy the full SHA 4e45c4fView commit details
Commits on Jun 5, 2018
-
Configuration menu - View commit details
-
Copy full SHA for bec2226 - Browse repository at this point
Copy the full SHA bec2226View commit details -
FIX #11: When merging indicate in prompt
- Overhaul of tests. Clearly separate functional and integration tests. - git_paths now resolves possible merge_file and rebase_dir, not guaranteed to exist. - Update README to show all possible branch states, including merging and rebase now added.
Configuration menu - View commit details
-
Copy full SHA for fab5894 - Browse repository at this point
Copy the full SHA fab5894View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7bb9ea5 - Browse repository at this point
Copy the full SHA 7bb9ea5View commit details
Commits on Jun 16, 2018
-
FIX #21: Fix order of gitstatus.py & zshrc.sh
- Clarify diverge test, different numbers.
Configuration menu - View commit details
-
Copy full SHA for f704934 - Browse repository at this point
Copy the full SHA f704934View commit details -
Configuration menu - View commit details
-
Copy full SHA for 11b83ba - Browse repository at this point
Copy the full SHA 11b83baView commit details