Execute prepare_repo.sh
on the repository(ies) to merge.
Clone https://github.com/robinst/git-merge-repos
Run ./run.sh /path/to/repo1:. /path/to/repo2:.
Merged repository is in merged-repo
Update .gitignore and remove those in sub-directories
Execute prepare_repo.sh
on the repository(ies) to merge.
Clone https://github.com/robinst/git-merge-repos
Run ./run.sh /path/to/repo1:. /path/to/repo2:.
Merged repository is in merged-repo
Update .gitignore and remove those in sub-directories
[DEFAULT] | |
other_versions = 5.9.1-SNAPSHOT/5.9.1/5.9.2-SNAPSHOT | |
branch = master | |
tag = auto | |
next_snapshot = auto | |
maintenance_version = auto | |
mp_to_upload = marketplace/target/marketplace*.zip | |
[marketplace-agenda] |
#!/bin/sh | |
# | |
# A git hook script to find and fix trailing whitespace | |
# in your commits. Bypass it with the --no-verify option | |
# to git-commit | |
# | |
if git-rev-parse --verify HEAD >/dev/null 2>&1 ; then | |
against=HEAD |
[Desktop Entry] | |
Type=Application | |
Exec=ndrive | |
Hidden=false | |
NoDisplay=false | |
X-GNOME-Autostart-enabled=true | |
Name[fr_FR]=Nuxeo Drive | |
Name=Nuxeo Drive | |
Comment[fr_FR]= | |
Comment= |
#!/bin/bash | |
VERSION="7.10" | |
HASHTAG="#Nx710" | |
TWITTER="New Set of Addons released on http://marketplace.nuxeo.com/ for Nuxeo Platform $VERSION:\nG+_POST_URL\n$HASHTAG" | |
GOOGLE="\n\nNew Set of Addons released on http://marketplace.nuxeo.com/ for the Nuxeo Platform $VERSION:\n" | |
while IFS=' ' read url name; do | |
version=${url#*=} | |
[ -z "$url" ] && continue | |
GOOGLE="$GOOGLE\n¤ *$name* $version\n$url\n" | |
done <<< " |