Skip to content

Commit

Permalink
DOC: added hint on merge.summary to CONTRIBUTING.md
Browse files Browse the repository at this point in the history
  • Loading branch information
yarikoptic committed Dec 16, 2015
1 parent ce5deba commit 8695086
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,20 @@ we outline the workflow used by the developers:
(If any of the above seems like magic to you, then look up the
[Git documentation](http://git-scm.com/documentation) on the web.)

Additional Hints
----------------

1. For merge commits to have more informative description, add to your
`.git/config` or `~/.gitconfig` following section:

[merge]
summary = true
log = true

and if conflicts occur, provide short summary on how they were resolved
in "Conflicts" listing within the merge commit
(see [example](https://github.com/datalad/datalad/commit/eb062a8009d160ae51929998771964738636dcc2)).


Quality Assurance
-----------------
Expand Down

0 comments on commit 8695086

Please sign in to comment.