diff --git a/.clang-format b/.clang-format index 95c28c05183229f8750cb534d1d561fe12079c9c..cb3eef848458bacbe674aa18dbba6cdc985d5c9e 100644 --- a/.clang-format +++ b/.clang-format @@ -1,6 +1,8 @@ BasedOnStyle: LLVM AlignAfterOpenBracket: true IndentWidth: 4 +AlwaysBreakAfterDefinitionReturnType: None +PenaltyReturnTypeOnItsOwnLine: 9999999 BreakBeforeBraces: Allman AllowShortBlocksOnASingleLine: false AllowShortFunctionsOnASingleLine: None diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 854de107f2f1412437d26dabb03372cceb150c5b..1fad7f02cc3efdb222eb74af384f911a867b1727 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,8 +59,8 @@ file. [alias] branch-name = "!git rev-parse --abbrev-ref HEAD" diff-nows = diff --color -w -log-branch = log --pretty="%Cgreen%h %Cred%an%Creset(%Cblue%ad%Creset)%n %s" master..$(git branch-name) -diff-branch = diff -U5 --minimal --color -w master...`git branch-name` +log-branch = log --pretty='%C(green)%h %C(red)%an %C(reset)(%C(blue)%ad%C(reset))%n%s' master.. +diff-branch = diff -U5 --minimal --color -w master... ``` This gives you four commands: @@ -75,6 +75,11 @@ This gives you four commands: diff master...branch`), without whitespace changes. (This should be roughly equivalent to Gitlab's diff). +If you prefer a graphical interface to see the files that have changed in your +commit, you can additionally use the `git gui` command to bring up a simple +interface. `git difftool` can also be used in combination with a GUI diff +viewer, to graphically view the output `git diff`. + ## Testing and Buildbot Your new features or fixes should include tests that cover the code you've added. There are numerous examples within the various `Tests` directory lying