From 5a4c58bf59aaa235d21d233e1cc33762a2b31a08 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Tue, 7 Jan 2025 16:21:55 -0600 Subject: [PATCH 1/5] Add suggested conventions (commit and license) --- conboarding.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conboarding.md b/conboarding.md index b5f9d73..0d91379 100644 --- a/conboarding.md +++ b/conboarding.md @@ -27,6 +27,12 @@ Ask Yarik to add you to the [CON Org](https://github.com/con). 1. While you are modifying .gitconfig you might consider setting your default branch as well. +1. Use standard commit messages, see [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). + (Also see [datalad's commit conventions](https://github.com/datalad/datalad-core/blob/main/CONTRIBUTING.md#conventional-commits) + +1. Follow [Reuse Software spec](https://reuse.software/spec-3.3/) to ensure that licenses and + copyright information are "comprehensive, unambiguous, human- and machine-readable". + ``` [init] defaultBranch = main From a93df285b9a72338aeee21b064d21ef7b7a91b17 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Tue, 7 Jan 2025 16:58:56 -0600 Subject: [PATCH 2/5] Fixup: keep defaultBranch example with prose --- conboarding.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conboarding.md b/conboarding.md index 0d91379..71e18a3 100644 --- a/conboarding.md +++ b/conboarding.md @@ -27,17 +27,17 @@ Ask Yarik to add you to the [CON Org](https://github.com/con). 1. While you are modifying .gitconfig you might consider setting your default branch as well. + ``` + [init] + defaultBranch = main + ``` + 1. Use standard commit messages, see [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). (Also see [datalad's commit conventions](https://github.com/datalad/datalad-core/blob/main/CONTRIBUTING.md#conventional-commits) 1. Follow [Reuse Software spec](https://reuse.software/spec-3.3/) to ensure that licenses and copyright information are "comprehensive, unambiguous, human- and machine-readable". -``` -[init] - defaultBranch = main -``` - ### Chat clients CON does not currently have a centralized IM infrastructure, there are however a number of per-project channels. From ea433250f1aaa0b9555cf345840bfeb33096a5f7 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 8 Jan 2025 09:03:57 -0600 Subject: [PATCH 3/5] Update conboarding.md Co-authored-by: Yaroslav Halchenko --- conboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conboarding.md b/conboarding.md index 71e18a3..b2f8b7b 100644 --- a/conboarding.md +++ b/conboarding.md @@ -35,7 +35,7 @@ Ask Yarik to add you to the [CON Org](https://github.com/con). 1. Use standard commit messages, see [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). (Also see [datalad's commit conventions](https://github.com/datalad/datalad-core/blob/main/CONTRIBUTING.md#conventional-commits) -1. Follow [Reuse Software spec](https://reuse.software/spec-3.3/) to ensure that licenses and +1. Follow [REUSE Software spec](https://reuse.software/spec-3.3/) to ensure that licenses and copyright information are "comprehensive, unambiguous, human- and machine-readable". ### Chat clients From dc9a5d9a7506a96dce69916bb630fcfa1b0734a3 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 8 Jan 2025 09:04:04 -0600 Subject: [PATCH 4/5] Update conboarding.md Co-authored-by: Yaroslav Halchenko --- conboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conboarding.md b/conboarding.md index b2f8b7b..b4b6895 100644 --- a/conboarding.md +++ b/conboarding.md @@ -24,7 +24,7 @@ Ask Yarik to add you to the [CON Org](https://github.com/con). [url "git@bitbucket.org:"] pushinsteadOf = https://bitbucket.org/ ``` -1. While you are modifying .gitconfig you might consider setting your +1. While you are modifying `~/.gitconfig` you might consider setting your default branch as well. ``` From 655c77294ba4a3dd077c345e590f757b55110858 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 8 Jan 2025 09:04:11 -0600 Subject: [PATCH 5/5] Update conboarding.md Co-authored-by: Yaroslav Halchenko --- conboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conboarding.md b/conboarding.md index b4b6895..89c192d 100644 --- a/conboarding.md +++ b/conboarding.md @@ -33,7 +33,7 @@ Ask Yarik to add you to the [CON Org](https://github.com/con). ``` 1. Use standard commit messages, see [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). - (Also see [datalad's commit conventions](https://github.com/datalad/datalad-core/blob/main/CONTRIBUTING.md#conventional-commits) + (Also see [DataLad's commit conventions](https://github.com/datalad/datalad-core/blob/main/CONTRIBUTING.md#conventional-commits) 1. Follow [REUSE Software spec](https://reuse.software/spec-3.3/) to ensure that licenses and copyright information are "comprehensive, unambiguous, human- and machine-readable".