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

Align prompt in help example #2769

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Conversation

wader
Copy link
Member

@wader wader commented Jul 25, 2023

Was accidentally unaligned in #2747

Now looks like this:

Example:

$ echo '{"foo": 0}' | jq .
{
  "foo": 0
}

Before looks like this:

Example:

 $ echo '{"foo": 0}' | jq .
{
	"foo": 0
}

@emanuele6
Copy link
Member

No, wait, you are downgrading the oniguruma submodule in this patch

@wader
Copy link
Member Author

wader commented Jul 25, 2023

Wops damn you git add -u (also damn me for having dirty work tree), sorry fixing

Was accidentally unaligned in jqlang#2747

Now looks like this:

Example:

	$ echo '{"foo": 0}' | jq .
	{
	  "foo": 0
	}

Before looks like this:

Example:

	 $ echo '{"foo": 0}' | jq .
	{
		"foo": 0
	}
@wader
Copy link
Member Author

wader commented Jul 25, 2023

@emanuele6 now things are back in order, good you spotted it

@emanuele6
Copy link
Member

👍
I can only merge (without bypassing protections) when all the CI workflows finish sucessfully.

@emanuele6 emanuele6 merged commit bb8221e into jqlang:master Jul 25, 2023
28 checks passed
@wader wader deleted the help-align-example branch July 25, 2023 13:11
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.

2 participants