... | @@ -91,7 +91,7 @@ and Tom), shall apply to all HDL Git repositories in the OHWR. |
... | @@ -91,7 +91,7 @@ and Tom), shall apply to all HDL Git repositories in the OHWR. |
|
- When preparing a private branch for merge to the proposed\_master
|
|
- When preparing a private branch for merge to the proposed\_master
|
|
branch, consider first rebasing the private branch against the
|
|
branch, consider first rebasing the private branch against the
|
|
proposed\_master branch. Please also tidy up the commit history
|
|
proposed\_master branch. Please also tidy up the commit history
|
|
using "rebase -i" to seperate logic changes into logical and
|
|
using "rebase -i" to separate logic changes into logical and
|
|
compilable commits. Git repository is not your Dropbox account.
|
|
compilable commits. Git repository is not your Dropbox account.
|
|
|
|
|
|
<!-- end list -->
|
|
<!-- end list -->
|
... | @@ -107,7 +107,7 @@ and Tom), shall apply to all HDL Git repositories in the OHWR. |
... | @@ -107,7 +107,7 @@ and Tom), shall apply to all HDL Git repositories in the OHWR. |
|
|
|
|
|
<!-- end list -->
|
|
<!-- end list -->
|
|
|
|
|
|
- If a commit is for some reason unacceptable, but alerady in master
|
|
- If a commit is for some reason unacceptable, but already in master
|
|
branch, make an explicit follow-up commit reverting it. Explain in
|
|
branch, make an explicit follow-up commit reverting it. Explain in
|
|
the commit why this was done. Do not rebase or cherry pick to remove
|
|
the commit why this was done. Do not rebase or cherry pick to remove
|
|
it.
|
|
it.
|
... | @@ -119,10 +119,10 @@ and Tom), shall apply to all HDL Git repositories in the OHWR. |
... | @@ -119,10 +119,10 @@ and Tom), shall apply to all HDL Git repositories in the OHWR. |
|
|
|
|
|
## Integration with build
|
|
## Integration with build
|
|
|
|
|
|
- Whenever a binary is shipped (software or vhdl), it should claim
|
|
- Whenever a binary is shipped (software or gateware), it should claim
|
|
which commit it was compiled from -- for example, for software we
|
|
which commit it was compiled from -- for example, for software we
|
|
can use "git describe" to get a useful string. Binaries from
|
|
can use "git describe" to get a useful string. Binaries from
|
|
uncommited code or development commits should be only used
|
|
uncommitted code or development commits should be only used
|
|
temporarily for experimenting.
|
|
temporarily for experimenting.
|
|
|
|
|
|
<!-- end list -->
|
|
<!-- end list -->
|
... | | ... | |