summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2021-06-06 13:21:53 -0400
committerOri Bernstein <ori@eigenstate.org>2021-06-06 13:21:53 -0400
commitd1d5f21992c0457596d855d1283ae8dbecc01338 (patch)
tree58cba5ff2bbd91b09a87ee13cc6cd8cc22eb9c76
parentce30e785b1c7b836c6fc387314e34503fc10a91c (diff)
downloadplan9front-d1d5f21992c0457596d855d1283ae8dbecc01338.tar.xz
distproto: sync with hg
-rw-r--r--sys/lib/sysconfig/proto/distproto3
-rwxr-xr-x[-rw-r--r--]sys/src/cmd/git/rebase0
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/lib/sysconfig/proto/distproto b/sys/lib/sysconfig/proto/distproto
index c01ee861d..ea5910ed3 100644
--- a/sys/lib/sysconfig/proto/distproto
+++ b/sys/lib/sysconfig/proto/distproto
@@ -434,5 +434,6 @@ usr d775
dist d775
plan9front d775
uid=glenda
- .git d775
+ .hgignore 664
+ .hg d775
+
diff --git a/sys/src/cmd/git/rebase b/sys/src/cmd/git/rebase
index 395f3e693..395f3e693 100644..100755
--- a/sys/src/cmd/git/rebase
+++ b/sys/src/cmd/git/rebase