Commit a4946c50 authored by Dave Moxey's avatar Dave Moxey

Add more verbose description of git diff-branch

parent fb7a011b
...@@ -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