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.

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

Fix git branch colouring #1011

Merged
merged 1 commit into from
Jun 28, 2016

Conversation

lpapierz
Copy link
Contributor

@lpapierz lpapierz commented Jun 28, 2016

More elegant way of detecting changes in git repo.


Second pull request to a proper branch per @Stanzilla request.

@jankatins
Copy link
Contributor

jankatins commented Jun 28, 2016

LGTM!

A git rebase origin/development followed by a git push -f could help to get rid of the merge commit.

Colouring fixed when there are some changes in a branch
@ghost ghost force-pushed the git_branch_colouring branch from 551cff1 to 9c0ad9f Compare June 28, 2016 12:14
@lpapierz
Copy link
Contributor Author

I did rebase on my development branch as well as rebase of this feature branch. Should be fine now.

@Stanzilla Stanzilla merged commit 14a6e59 into cmderdev:development Jun 28, 2016
@vBm
Copy link

vBm commented Jun 30, 2016

I must say I don't like this because even untracked files are now triggering color change 👎
Maybe this is the correct way of doing coloring but you know xD

@lpapierz
Copy link
Contributor Author

Can be easily changed, to exclude untracked files. The question is what is the correct behaviour here. Not sure who decides here...

@Stanzilla
Copy link
Member

Hrm, green for clean, yellow for untracked files, red for untracked files and changes?

@lpapierz
Copy link
Contributor Author

lpapierz commented Jul 1, 2016

Sounds like a plan, but I would leave the default font colour for clean repo.

@Stanzilla
Copy link
Member

Stanzilla commented Jul 1, 2016

Yeah probably more sane

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants