aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-06-05 08:32:39 -0400
committerNick Mathewson <nickm@torproject.org>2019-06-05 08:32:39 -0400
commit0c16ec4c0775db4a91a99cb935d2528233deafb2 (patch)
treef6a09cfd92b579ffcf13f8d9843bc4c8c4929eb0 /changes
parent8cb6b2b9ab74d187e4839d298fbce06dafeb33f0 (diff)
parente8aab46a3a95e6d424553625c2a671d79c583d22 (diff)
downloadtor-0c16ec4c0775db4a91a99cb935d2528233deafb2.tar.gz
tor-0c16ec4c0775db4a91a99cb935d2528233deafb2.zip
Merge branch 'bug30286_2_squashed'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug302864
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug30286 b/changes/bug30286
new file mode 100644
index 0000000000..f2fc67a484
--- /dev/null
+++ b/changes/bug30286
@@ -0,0 +1,4 @@
+ o Minor bugfixes (developer tooling):
+ - Fix pre-push hook to refrain from rejecting fixup and squash commits
+ when pushing to non-upstream git remote. Fixes bug 30286; bugfix on
+ 0.4.0.1-alpha.