Skip to content

GitLab

Commit 588a4ba3 authored by Dave Moxey's avatar Dave Moxey Committed by Spencer Sherwin
Browse files

Add more verbose description of git diff-branch

parent 0298cfe8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
CONTRIBUTING.md
View file @ 588a4ba3
...@@ -70,8 +70,10 @@ This gives you four commands: ...@@ -70,8 +70,10 @@ This gives you four commands:
whitespace changes. whitespace changes.
- `git log-branch` shows a minimised log of all the commits on the current - `git log-branch` shows a minimised log of all the commits on the current
branch that are not in `master`. branch that are not in `master`.
- `git diff-branch` shows a diff of the current branch against `master` without - `git diff-branch` shows a diff of the current branch against `master`, without
whitespace changes. showing changes from `master` that aren't present in the branch (i.e. `git
diff master...branch`), without whitespace changes. (This should be roughly
equivalent to Gitlab's 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
......
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