Commit 2305b109 authored by Dave Moxey's avatar Dave Moxey

Address Douglas' comments, minor tweak to .clang-format

parent a4946c50
BasedOnStyle: LLVM BasedOnStyle: LLVM
AlignAfterOpenBracket: true AlignAfterOpenBracket: true
IndentWidth: 4 IndentWidth: 4
AlwaysBreakAfterDefinitionReturnType: None
PenaltyReturnTypeOnItsOwnLine: 9999999
BreakBeforeBraces: Allman BreakBeforeBraces: Allman
AllowShortBlocksOnASingleLine: false AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: None AllowShortFunctionsOnASingleLine: None
......
...@@ -59,8 +59,8 @@ file. ...@@ -59,8 +59,8 @@ file.
[alias] [alias]
branch-name = "!git rev-parse --abbrev-ref HEAD" branch-name = "!git rev-parse --abbrev-ref HEAD"
diff-nows = diff --color -w diff-nows = diff --color -w
log-branch = log --pretty="%Cgreen%h %Cred%an%Creset(%Cblue%ad%Creset)%n %s" 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...`git branch-name` diff-branch = diff -U5 --minimal --color -w master...
``` ```
This gives you four commands: This gives you four commands:
...@@ -75,6 +75,11 @@ This gives you four commands: ...@@ -75,6 +75,11 @@ This gives you four commands:
diff master...branch`), without whitespace changes. (This should be roughly diff master...branch`), without whitespace changes. (This should be roughly
equivalent to Gitlab's diff). 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 ## Testing and Buildbot
Your new features or fixes should include tests that cover the code you've 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 added. There are numerous examples within the various `Tests` directory lying
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment