Skip to content

Commit ce9f517

Browse files
committed
Revert "CONTRIBUTING: attempt to fix indentation. [skip ci]" [skip ci]
This reverts commit 7f6c0ca. That didn't fix the indentation.
1 parent 7f6c0ca commit ce9f517

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

CONTRIBUTING.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -89,37 +89,37 @@ and ask!
8989
actual test compares the current text output with the expected result
9090
(`sample.out`) saved from a previous version.
9191

92-
Any new/updated fields in a dissector must be present in a `sample.pcap` file
93-
and the corresponding output file.
92+
Any new/updated fields in a dissector must be present in a `sample.pcap` file
93+
and the corresponding output file.
9494

95-
Configuration is set in `tests/TESTLIST`.
96-
Each line in this file has the following format:
97-
```
98-
test-name sample.pcap sample.out tcpdump-options
99-
```
95+
Configuration is set in `tests/TESTLIST`.
96+
Each line in this file has the following format:
97+
```
98+
test-name sample.pcap sample.out tcpdump-options
99+
```
100100

101-
The `sample.out` file can be produced as follows:
102-
```
103-
(cd tests && TZ=GMT0 ../tcpdump -# -n -r sample.pcap tcpdump-options > sample.out)
104-
```
101+
The `sample.out` file can be produced as follows:
102+
```
103+
(cd tests && TZ=GMT0 ../tcpdump -# -n -r sample.pcap tcpdump-options > sample.out)
104+
```
105105

106-
Or, for convenience, use `./update-test.sh test-name`
106+
Or, for convenience, use `./update-test.sh test-name`
107107

108-
It is often useful to have test outputs with different verbosity levels
109-
(none, `-v`, `-vv`, `-vvv`, etc.) depending on the code.
108+
It is often useful to have test outputs with different verbosity levels
109+
(none, `-v`, `-vv`, `-vvv`, etc.) depending on the code.
110110

111111
11) Test using `make check` (current build options) and `./build_matrix.sh`
112-
(a multitude of build options, build systems and compilers). If you can,
113-
test on more than one operating system. Don't send a pull request until
114-
all tests pass.
112+
(a multitude of build options, build systems and compilers). If you can,
113+
test on more than one operating system. Don't send a pull request until
114+
all tests pass.
115115

116116
12) Try to rebase your commits to keep the history simple.
117-
```
118-
git fetch upstream
119-
git rebase upstream/master
120117
```
121-
(If the rebase fails and you cannot resolve, issue `git rebase --abort`
122-
and ask for help in the pull request comment.)
118+
git fetch upstream
119+
git rebase upstream/master
120+
```
121+
(If the rebase fails and you cannot resolve, issue `git rebase --abort`
122+
and ask for help in the pull request comment.)
123123

124124
13) Once 100% happy, put your work into your forked repository using `git push`.
125125

0 commit comments

Comments
 (0)