Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add indicators for interactive rebase and bisect #94

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

Add indicators for interactive rebase and bisect #94

wants to merge 49 commits into from

Conversation

compholio
Copy link

These commits add support for several nice conveniences:

  • A wrench indicator for interactive rebase.
  • A binoculars indicator for bisecting.
  • Revision progress for bisecting (tested commits / commits remaining).
  • Approximate number of remaining bisect steps.

I don't know about everyone else, but rebasing and bisecting are a critical part of my workflow and having indications for that helps me to avoid making a lot of mistakes.

compholio and others added 30 commits June 6, 2016 14:23
@compholio
Show a wrench symbol for interactive rebasing.
69988cf
@compholio
Show a binoculars symbol for bisecting.
4fd423e
@compholio
Add bisect status indicator (tested vs. total revisions).
408b529
@compholio
Add remaining bisect steps estimate indicator.
3705ad6
@compholio
Replace bisect symbol with telescope.
2f934d7 
I have no idea where the binoculars went...
@compholio
Use a 'bug' prompt icon for a completed bisect.
7cd287c
@compholio
Use a 'microscope' prompt icon for a nearly completed bisect.
2dfd288
@krayon
Fix last character having black background
49a642e
@krayon
Remove last char manual fix documentation
4556f33
@cy4n
Fix ohmygit-enabled error if not in git dir
2f0206c
@cy4n
remove --local param
9825dff 
also remove the obsolete error redirect to /dev/null
@cy4n
replace '$' signs in branch name by pile_of_poo
900eaa5 
prevent code execution by prompt generation, see https://github.com/njhartwell/pw3nage
@cy4n
replace '$' signs in branch name by pile_of_poo
0ac3c30 
prevent code execution by prompt generation, see https://github.com/njhartwell/pw3nage
@compholio
Use the 'git repo' symbol that is also available in Courier New.
09b8e9c
@compholio
Add an indicator for out of date submodules.
9e349cf
@compholio
Merge remote-tracking branch 'krayon/lastcharfix'
5a1df36
@compholio
Merge remote-tracking branch 'cy4n/prevent_code_exec'
41972b3
@cy4n
Merge pull request #1 from krayon/lastcharfix
3dde872 
Lastcharfix
@cy4n
merged compholio-master
e8dddc9
@cy4n
Merge branch 'compholio-master'
666a8d1
@cy4n
change has_stashes_indicator color, yellow on white sucked
84e7a16
@compholio
Use a 'cached modifications' symbol that is also available in Courier…
a45eb7b 
… New.
@compholio
Use a 'ready to commit' symbol that is also availabe in Courier New.
e327162
@compholio
Use a 'detached head' symbol that is also available in Courier New.
adc5000
@compholio
Use an 'untracked branch' symbol that is also available in Courier New.
61082e9
@compholio
Use a 'needs to merge' symbol that is also available in Courier New.
6af3750
@compholio
Use a 'has stashes' symbol that is also available in Courier New.
6145105
@compholio
Use an 'untracked files' symbol that is also available in Courier New.
7e99e94
@compholio
Use a 'tag' symbol that is also available in Courier New.
c55239a
@compholio
Move the arrow symbol to being customizable.
0f1239c 
This is the only symbol where I have been unable to find a reasonable
substitution from a standard font (Courier New).
compholio and others added 13 commits August 9, 2017 17:43
@compholio
Reduce code churn when custom_build_prompt parameters are changed.
9eaa25c
@cy4n
Merge pull request arialdomartini#3 from compholio/master
36b5c05 
Use more commonly available symbols
@cy4n
Merge branch 'master' of https://github.com/compholio/oh-my-git into …
4b68e08 
…compholio-master
@cy4n
Merge branch 'compholio-master'
50b45ec
@compholio
Add a 'condensed' mode that absorbs cached adds/deletions into modifi…
8eece85 
…cations.
@cy4n
Merge branch 'compholio-master'
2ee6e09
@compholio
Add support for multiple tags on the same commit.
4d0bf78
@cy4n
Merge pull request arialdomartini#6 from compholio/master
973ddbc 
Add support for multiple tags on the same commit.
@wwna
Use shallow clone
298daee
@wwna
Redirect error to null when checking oh-my-git.enabled
8c25b67
@wwna
Add support for python virtualenv
dd12020
@wwna
Fix symbol not show up with font issue
a3808ae
@cy4n
Merge pull request arialdomartini#7 from shadowwalker/master
f7bfccb 
Add support for python virtualenv
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@compholio @cy4n @krayon @wwna