Skip to content

Instantly share code, notes, and snippets.

View maikebing's full-sized avatar
🦧
Out sick

maikebing

🦧
Out sick
View GitHub Profile
@maikebing
maikebing / merge-to-subdir
Last active February 22, 2024 17:28 — forked from npryce/merge-to-subdir
Merge history from one Git repository as the history of a subdirectory of another Git repository
#!/bin/bash
# Usage: merge-to-subdir source-repo destination-repo subdir
#
# Merges the history of source-repo into destination-repo as the
# history of the subdirectory subdir.
#
# source-repo can be local or remote.
# destination-repo must be local to the machine.
# subdir can be a relative path, in which case intermediate
git config --global https.proxy http://127.0.0.1:1080
git config --global https.proxy https://127.0.0.1:1080
git config --global --unset http.proxy
git config --global --unset https.proxy
npm config delete proxy
@maikebing
maikebing / auto_update.md
Created November 7, 2016 05:30 — forked from iBaozi/auto_update.md
gitlab 自动发布

自动更新代码

功能

该功能通过监听 git push 事件,触发A服务器指定目录 git pull。
比如 forumsbaozi 分支在任意环境下成功push后,会在A服务器的 /data/web/framework/trunk/ baozi/ forums 目录执行 git pull

部署

在A服务器运行 auto_update.py。
在 gitlab,添加 web hook: http://A服务器IP:8003