diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-01-01 15:01:04 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-01-01 15:01:04 +0000 |
| commit | 3d8e3fc072525f0b811a8b104a944cc6fbf76c1c (patch) | |
| tree | 32dc4caf297a9a930f0215ef3ea8416d2e13ef7b | |
| parent | d8b85fe8dc48fafe87b482ae36eb388a33c806f0 (diff) | |
README-hacking.md checklist now also ignores changes in paper.tex
In the previous commit, we added the files to ignore from the template
branch, but only the files that had been deleted. With this commit,
`paper.tex' is also added to the files that must be ignored from the
template branch (the file remains in the project, but in the template
branch, its contents are just dummy place-holders).
| -rw-r--r-- | README-hacking.md | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/README-hacking.md b/README-hacking.md index f545fa0..d3b2098 100644 --- a/README-hacking.md +++ b/README-hacking.md @@ -653,15 +653,20 @@ First custom commit $ ./project make ``` - - Tell Git _not_ to merge changes in the dummy `delete-me` files (by - keeping their names in a `.gitattributes` file. Note that only the - first one is a `>` (to re-write the file), the rest are `>>` (to - append to it). After doing this step in your own branch, when future - commits of the template make a change in the dummy files, they will - not be imported into your project's branch (it can be annoying!). + - Tell Git _not_ to merge changes in the dummy `delete-me` files, and + `paper.tex` (its contents are just dummy place holders) from the + template (by keeping their names in a `.gitattributes` file). Note + that only the first `echo` command has a `>` (to re-write the file + with the given line), the rest are `>>` (to append to it). After + doing this step in your own branch, when future commits in the + template make any change in the given files, they will not be + imported into your project's branch (it can be annoying!). You can + follow a similar strategy if you want to avoid any other set of + files to be imported from the template into your project's branch. ```shell - $ echo "tex/src/delete-me.mk merge=ours" > .gitattributes + $ echo "paper.tex" > .gitattributes + $ echo "tex/src/delete-me.mk merge=ours" >> .gitattributes $ echo "tex/src/delete-me-demo.mk merge=ours" >> .gitattributes $ echo "reproduce/analysis/make/delete-me.mk merge=ours" >> .gitattributes $ echo "reproduce/analysis/config/delete-me-num.mk merge=ours" >> .gitattributes |