aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/config
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 19:37:48 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 20:00:28 +0100
commita69f2ce5624b0b683b793a2f4cb68c7023458f15 (patch)
treebf103ae11ba66ba658813d954d92b987d2097eb8 /reproduce/software/config
parent3d8aa5953c4e0b79278ab2e27ec4e1051310d04f (diff)
README-hacking.md: Improved section on ignoring some files in Maneage
When some files should not be merged, until now we were suggesting to also add deleted files to the '.gitattributes' file. However, this feature of Git doesn't work for deleted files and they would still show up in the 'master' branch after a merge. So with this commit, we have added a simple AWK command to run after a merge that will automatically detect and delete such files (using the output of 'git status --porcelain'). Also, two minor typos were corrected in the newly added 'servers-backup.conf' file: the copyright year was wrong and there was no new-line at the end of the file (a good convention!).
Diffstat (limited to 'reproduce/software/config')
-rw-r--r--reproduce/software/config/servers-backup.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/reproduce/software/config/servers-backup.conf b/reproduce/software/config/servers-backup.conf
index a4320fa..c2ade5a 100644
--- a/reproduce/software/config/servers-backup.conf
+++ b/reproduce/software/config/servers-backup.conf
@@ -3,7 +3,7 @@
# is irrelevant). Note that this is not a to be read as a variable but will
# be parsed as a list.
#
-# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice and
@@ -11,4 +11,4 @@
# warranty.
http://gitlab.com/maneage/tarballs-software/-/raw/master
http://git.maneage.org/tarballs-software.git/plain
-http://akhlaghi.org/maneage-software \ No newline at end of file
+http://akhlaghi.org/maneage-software