Added variables to make customizing the prompt easier. - #277
Merged
Merged
Conversation
Added the following variables to $global:GitPromptSettings to make
customizing the prompt easier.
AddedText, default '+'
ModifiedText, default '~'
RemovedText, default '-'
ConflictedText, default '!'
Owner
|
Thanks for this! Two suggestions:
|
added 3 commits
May 4, 2016 12:56
Added "File" prefix to (now) FileAddedText, FileModifiedText,
FileRemovedText, and FileConflictedText--before, LocalWorkingStatusSymbol
and ConflictedText had the same content by default ("!"), as did
LocalStagedStatusSymbol and ModifiedText ("~").
Changed prompt output of the above variables to use string expansion
rather than concatenation.
Also re-aligned several indentation blocks from 2-space to 4-space
indents. In my opinion, tabs help avoid these issues, but I'll defer to the
lead coder here.
Several lines had nothing but spaces on them, so I removed the spaces
(keeping the empty double line-break).
Added "File" prefix to (now) FileAddedText, FileModifiedText,
FileRemovedText, and FileConflictedText--before, LocalWorkingStatusSymbol
and ConflictedText had the same content by default ("!"), as did
LocalStagedStatusSymbol and ModifiedText ("~").
Changed prompt output of the above variables to use string expansion
rather than concatenation.
Also re-aligned several indentation blocks from 2-space to 4-space
indents. In my opinion, tabs help avoid these issues, but I'll defer to the
lead coder here.
Several lines had nothing but spaces on them, so I removed the spaces
(keeping the empty double line-break).
Contributor
Author
|
Okay, fixed that stuff. Check out commit 2e06383. |
Owner
|
Looks great! Would you mind rebasing this branch on latest |
Contributor
Author
|
Okay, I believe I rebased it correctly, but check to make sure. |
Owner
|
It changed, but still weird: You should be able to do something like this: |
Contributor
Author
Looks somewhat cleaner, is this what you were going for? |
Owner
|
Weird...I would expect a linear history: (And really, you can squash the second "Changed variables" commit into the first one.) I wonder if part of your branch has been merged into your local |
Owner
|
Actually, this is fine. Thanks for the contribution! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added the following variables to $global:GitPromptSettings to make customizing the prompt easier.
It may be noteworthy that LocalWorkingStatusSymbol and ConflictedText will have the same content by default (“!”), as will LocalStagedStatusSymbol and ModifiedText (“~”)—this could lead to confusion. However, I didn’t want to delete existing variables, so I left them alone for the time being.
I also realigned the indenting on the block of stash-related variables within GitPromptSettings.