diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-20 12:04:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-20 12:04:05 +0100 |
| commit | 8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283 (patch) | |
| tree | e271f6038037fadd5af453ee879a6142cdd8ad0b | |
| parent | 87a60ee84f8abfc26f200ceac86ef32a690b9e21 (diff) | |
| parent | a62e20f6f84d747e55891a0d8aadd0737297571e (diff) | |
| download | qemu-8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/misc-20170720-pull-request' into staging
git orderfile and editorconfig for 2.10
# gpg: Signature made Thu 20 Jul 2017 09:00:01 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/misc-20170720-pull-request:
add editorconfig
add scripts/git.orderfile
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .editorconfig | 15 | ||||
| -rw-r--r-- | scripts/git.orderfile | 29 |
2 files changed, 44 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..b2022e391a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +# http://editorconfig.org +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 + +[Makefile*] +indent_style = tab +indent_size = 8 + +[*.{c,h}] +indent_style = space +indent_size = 4 diff --git a/scripts/git.orderfile b/scripts/git.orderfile new file mode 100644 index 0000000000..ac699700b1 --- /dev/null +++ b/scripts/git.orderfile @@ -0,0 +1,29 @@ +# +# order file for git, to produce patches which are easier to review +# by diffing the important stuff like interface changes first. +# +# one-off usage: +# git diff -O scripts/git.orderfile ... +# +# add to git config: +# git config diff.orderFile scripts/git.orderfile +# + +# Documentation +docs/* +*.texi + +# build system +configure +Makefile* +*.mak + +# qapi schema +*.json + +# headers +*.h + +# code +*.c + |