Skip to content

Instantly share code, notes, and snippets.

View wetneb's full-sized avatar

Antonin Delpeuch wetneb

View GitHub Profile
@wetneb
wetneb / reuse_merge
Last active September 6, 2023 08:00
reuse_merge: script to reuse a previous merge during a rebase
#!/bin/bash
set -e
# WARNING: This script will delete any untracked files present in the working tree
# Usage: reuse_merge <commit>
# where <commit> is a merge commit whose parents have identical contents to HEAD and MERGE_HEAD (which the script will check).
# This will reuse the state of the supplied merge to make a new merge commit on top of HEAD and MERGE_HEAD.
# This is useful when using `git rebase --rebase-merges`, when reworking commits between merges
@wetneb
wetneb / afigeo_to_osm_geojson.py
Last active May 22, 2020 12:42
Affigeo PEI geojson to OSM converter
#!/bin/env python3
# Ce script nécessite l'installation de "dateparser":
# pip install dateparser
import json, sys, dateparser
# Adaptez ces lignes pour changer la source des données
source = 'SDIS 71'
sdis_id_key = 'ref:SDIS71'