Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ronald
Nektar
Commits
0298cfe8
Commit
0298cfe8
authored
Feb 27, 2016
by
Dave Moxey
Committed by
Spencer Sherwin
Mar 04, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some git commands
parent
9d448e4f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
0 deletions
+25
-0
CONTRIBUTING.md
CONTRIBUTING.md
+25
-0
No files found.
CONTRIBUTING.md
View file @
0298cfe8
...
...
@@ -48,6 +48,31 @@ project. It's a pretty simple process:
below) -- otherwise, try to keep formatting consistent with the file you're
working on.
## Git cheatsheet
Although Gitlab gives a nice interface to view the diff between a branch and
master, for large merges, it can be slow. The following
`git`
aliases can
provide a quicker alternative. You can use these by inserting them into the
`.gitconfig`
file in your home directory, or inside the
`nektar++/.git/config`
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`
```
This gives you four commands:
-
`git branch-name`
displays the current branch name
-
`git diff-nows`
shows a diff of your current commit in colour, without
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.
## 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment