Merge branch 'master' into layer/cosmetics

2025-11-23 11:41:18 -05:00 · 2017-09-19 19:04:55 +02:00
parent b5814452f3 69bedcb8a1
commit 1fe43a5001
11 changed files with 12 additions and 12 deletions
--- a/bin/borg-bootstrap
+++ b/bin/borg-bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2016  Jonas Bernoulli
+# Copyright (C) 2016-2017  Jonas Bernoulli
 #
 # Author: Jonas Bernoulli <jonas@bernoul.li>
 # License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
@@ -52,7 +52,7 @@ do
                    then
                        git config remote.pushDefault "$remote"
                    else
-                        branch=$(git rev-parse --abbref-ref HEAD)
+                        branch=$(git rev-parse --abbrev-ref HEAD)
                        test -n "$branch" &&
                            git config branch.master.remote "$remote"
                    fi
--- a/lib/auto-compile
+++ b/lib/auto-compile
--- a/lib/borg
+++ b/lib/borg
--- a/lib/closql
+++ b/lib/closql
--- a/lib/dash
+++ b/lib/dash
--- a/lib/emacsql
+++ b/lib/emacsql
--- a/lib/epkg
+++ b/lib/epkg
--- a/lib/magit
+++ b/lib/magit
--- a/lib/packed
+++ b/lib/packed
--- a/lib/use-package
+++ b/lib/use-package
--- a/lib/with-editor
+++ b/lib/with-editor