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
[alias] | |
ls = "ls-tree --name-only" | |
ll = "ls-tree -l" | |
st = status -sb | |
ci = commit | |
co = checkout | |
br = branch | |
branches = branch -a | |
glog = log --graph --abbrev-commit --date=relative | |
mergenff = merge --no-ff |
# This snippet provides easy debugging of types and files filtering. | |
# Usage: pre-commit run identity | |
# pre-commit run identity --all-files | |
# pre-commit run identity --from-ref origin/HEAD --to-ref HEAD | |
repos: | |
- repo: meta | |
hooks: | |
- id: identity | |
name: identity (filtered) | |
types: [ hcl ] |
import java.lang.annotation.ElementType; | |
import java.lang.annotation.Retention; | |
import java.lang.annotation.RetentionPolicy; | |
import java.lang.annotation.Target; | |
/** | |
* JUnit 4 equivalent of JUnit 5's {@code org.junit.jupiter.api.Order} | |
*/ | |
@Retention(RetentionPolicy.RUNTIME) | |
@Target({ ElementType.METHOD }) |
( | |
export NPM_USER=<LdapUsername> | |
export NPM_PASS=<LdapPassword> | |
export NPM_EMAIL=<GitHubEmail> | |
sudo npm install -g npm-cli-adduser | |
npm config set email $NPM_EMAIL | |
for repo in $(curl -s -u "$NPM_USER:$NPM_PASS" -X GET "https://mavenin.nuxeo.com/nexus/service/rest/v1/repositories" -H "accept: application/json"|jq -r ' .[] | select(.format == "npm") | .name'); do | |
[[ $repo == "npm-internal" ]] && continue | |
echo $repo | |
npm-cli-adduser -r https://mavenin.nuxeo.com/nexus/repository/$repo/ |
#!/bin/bash -e | |
# Usage: gitformat | |
# Create a git commit with formatting changes | |
echo "Ref before changes: $(git id)" | |
#HEAD=${1:-HEAD} | |
pushd $(git rev-parse --show-toplevel) | |
FILES=$(git diff-index --name-only --diff-filter=ad HEAD|xargs) | |
if [ -z "$FILES" ]; then | |
echo "No files" | |
exit 0 |
"use docx2txt.pl to allow VIm to view the text content of a .docx file directly. | |
autocmd BufReadPre *.docx set ro | |
autocmd BufReadPost *.docx %!docx2txt.pl | |
set number | |
" size of a hard tabstop | |
set tabstop=4 | |
" size of an "indent" | |
set shiftwidth=4 | |
" a combination of spaces and tabs are used to simulate tab stops at a width other than the (hard)tabstop | |
set softtabstop=4 |
#!/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 <<< " |
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
# Standalone aliases install: | |
# wget https://gist.githubusercontent.com/jcarsique/24f8dd46d176bb67253e/raw/.gitaliases -O ~/.gitaliases | |
# git config --global include.path ~/.gitaliases | |
[alias] | |
ls = "ls-tree --name-only" | |
ll = "ls-tree -l" | |
st = status -sb | |
ci = commit | |
co = checkout |
<?xml version="1.0" encoding="UTF-8"?> | |
<bookmarks> | |
<site url="http://andrei.gmxhome.de/eclipse/" selected="true" name="andrei plugins"/> | |
<site url="http://archive.eclipse.org/mylyn/drops/3.11.0/v20140314-2044" selected="true" name="Mylyn for Eclipse 3.7, 3.8 and 4.2"/> | |
<site url="http://archive.eclipse.org/mylyn/drops/3.8.0/v20120612-0600" selected="true" name="Mylyn for Eclipse 3.6, 3.7 and 3.8"/> | |
<site url="http://community.nuxeo.com/static/nuxeo-ide/dev/site/site.xml" selected="true" name="Nuxeo IDE DEV update site"/> | |
<site url="http://community.nuxeo.com/static/nuxeo-ide/stable/site/" selected="true" name="Nuxeo IDE Update Site"/> | |
<site url="http://dadacoalition.org/yedit" selected="true" name="Update Site"/> | |
<site url="http://dev-utils-plugin.googlecode.com/svn/trunk/update" selected="true" name="Update Site"/> | |
<site url="http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/releases/0.4.1" selected="false" name=""/> |