FDOS / fdisk

Fixed Disk Setup Program - manages partitions using the MBR partitioning scheme
GNU General Public License v2.0
44 stars 14 forks source link

Repository: Set up gitattributes to avoid churn #9

Closed andrewbird closed 3 years ago

andrewbird commented 3 years ago

With this applied, #7 diff on MAIN.H can be reduced to just the significant changes

git checkout master
git pull upstream
git checkout tc_compile
git rebase master
git add --renormalize .
git commit -a --amend
git show SOURCES/MAIN.H

commit 251ca9be68390f20e8163e716c8feef6da9bf08a (HEAD -> t1)
Author: Micah Cochran <micah_coch@yahoo.com>
Date:   Sun Jan 17 17:26:26 2021 -0600

    Make able to compile under Turbo C++ 3.0

diff --git a/SOURCE/FDISK/FDISK.PRJ b/SOURCE/FDISK/FDISK.PRJ
index 17be6ae..a843635 100644
Binary files a/SOURCE/FDISK/FDISK.PRJ and b/SOURCE/FDISK/FDISK.PRJ differ
diff --git a/SOURCE/FDISK/MAIN.H b/SOURCE/FDISK/MAIN.H
index 2901c29..a7ab4fa 100644
--- a/SOURCE/FDISK/MAIN.H
+++ b/SOURCE/FDISK/MAIN.H
@@ -192,7 +192,8 @@ typedef unsigned char  _u8;
 */

-#include "catgets.h"
+/* #include "catgets.h"  */
+#include "kitten.h"

 MEXTERN nl_catd cat;
 MEXTERN char *s;

Then you'll need to repush to update the PR

git push -f origin tc_compile