From 974789055ff8183521cd9fb641ec40dadd2c80c4 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Wed, 15 Jun 2016 14:20:11 -0400
Subject: Update README so it's good for both github.com and github.mit.edu

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4486c7f76..91a6c8142 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
-Synthesizing Correct-by-Construction Assembly for Cryptographic Primitives
+Fiat-Crypto: Synthesizing Correct-by-Construction Assembly for Cryptographic Primitives
 -----
 
 ... which would make a good paper title.
 
+NOTE: The gibhub.com repo is only intermittently synced with
+github.mit.edu. If you're in CSAIL, you should pull from the
+github.mit.edu repo.
+
 To build:
 
 	export COQPATH="$(pwd)/coqprime${COQPATH:+:}$COQPATH"
-- 
cgit v1.2.3


From 94fc77bb39af399a0d1256fccdc11b90c0d00cb5 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Wed, 15 Jun 2016 14:29:24 -0400
Subject: Add .mailmap

---
 .mailmap | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..7c61488f3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,18 @@
+## This file allows joining different accounts of a single person.
+## Cf for instance: git shortlog -nse. More details via: man git shortlog
+
+# having the same name <email> name <email> on a line will fix capitalization
+Adam Chlipala <adamc@csail.mit.edu>                        Adam Chlipala <adamc@csail.mit.edu>
+Adam Chlipala <adam@chlipala.net>                          Adam Chlipala <adamc@csail.mit.edu>
+Andres Erbsen <andreser@mit.edu>                           Andres Erbsen <andreser@mit.edu>
+Jade Philipoom <jadep@mit.edu>                             Jade Philipoom <jadep@mit.edu>
+jadep <jade.philipoom@gmail.com>                           Jade Philipoom <jadep@mit.edu>
+jadep <jadep@mit.edu>                                      Jade Philipoom <jadep@mit.edu>
+Jason Gross <jgross@mit.edu>                               Jason Gross <jgross@mit.edu>
+Robert Sloan <varomodt@gmail.com>                          Robert Sloan <varomodt@gmail.com>
+Robert Sloan <varomodt@Roberts-MacBook.local>              Robert Sloan <varomodt@gmail.com>
+Robert Sloan <rsloan@sumologic.com>                        Robert Sloan <varomodt@gmail.com>
+Robert Sloan <varomodt@dhcp-18-189-26-21.dyn.MIT.EDU>      Robert Sloan <varomodt@gmail.com>
+Robert Sloan <varomodt@dhcp-18-189-51-40.dyn.MIT.EDU>      Robert Sloan <varomodt@gmail.com>
+Rob Sloan <varomodt@gmail.com>                             Robert Sloan <varomodt@gmail.com>
+varomodt <varomodt@localhost.localdomain>                  Robert Sloan <varomodt@gmail.com>
-- 
cgit v1.2.3


From 7dc373e4c82f3e7a37832321abc9057cb55348f2 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Thu, 16 Jun 2016 17:32:25 -0400
Subject: Be a bit more quiet on make unless VERBOSE=1 is passed

---
 Makefile | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5fb1ab33c..48f8a9d5b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,21 @@ SRC_DIR  := src
 .PHONY: coq clean install coqprime-8.4 coqprime-8.5 coqprime update-_CoqProject
 .DEFAULT_GOAL := coq
 
+VERBOSE = 0
+
+SILENCE_COQC_0 = @echo "COQC $<"; #
+SILENCE_COQC_1 =
+SILENCE_COQC = $(SILENCE_COQC_$(VERBOSE))
+
+SILENCE_COQDEP_0 = @echo "COQDEP $<"; #
+SILENCE_COQDEP_1 =
+SILENCE_COQDEP = $(SILENCE_COQDEP_$(VERBOSE))
+
 SORT_COQPROJECT = sed 's,[^/]*/,~&,g' | env LC_COLLATE=C sort | sed 's,~,,g'
 
 update-_CoqProject::
-	(echo '-R $(SRC_DIR) $(MOD_NAME)'; echo '-R Bedrock Bedrock'; (git ls-files 'src/*.v' 'Bedrock/*.v' | $(SORT_COQPROJECT))) > _CoqProject
+	$(VECHO) "GIT LS-FILES *.V > _COQPROJECT"
+	$(Q)(echo '-R $(SRC_DIR) $(MOD_NAME)'; echo '-R Bedrock Bedrock'; (git ls-files 'src/*.v' 'Bedrock/*.v' | $(SORT_COQPROJECT))) > _CoqProject
 
 coq: coqprime Makefile.coq
 	$(MAKE) -f Makefile.coq
@@ -28,7 +39,8 @@ coqprime-8.5:
 	$(MAKE) -C coqprime-8.5
 
 Makefile.coq: Makefile _CoqProject
-	$(COQBIN)coq_makefile -f _CoqProject -o Makefile.coq
+	$(VECHO) "COQ_MAKEFILE"
+	$(Q)$(COQBIN)coq_makefile -f _CoqProject -o Makefile.coq
 
 clean: Makefile.coq
 	$(MAKE) -f Makefile.coq clean
-- 
cgit v1.2.3