From a4946c501c357982f72aacdb4a06ab8b95a841fc Mon Sep 17 00:00:00 2001 From: David Moxey Date: Sat, 27 Feb 2016 15:30:40 +0000 Subject: [PATCH] Add more verbose description of git diff-branch --- CONTRIBUTING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b1dafce7..854de107f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,8 +70,10 @@ This gives you four commands: whitespace changes. - `git log-branch` shows a minimised log of all the commits on the current branch that are not in `master`. -- `git diff-branch` shows a diff of the current branch against `master` without - whitespace changes. +- `git diff-branch` shows a diff of the current branch against `master`, without + 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 Your new features or fixes should include tests that cover the code you've -- GitLab