Skip to content

Instantly share code, notes, and snippets.

View arne-cl's full-sized avatar

Arne Neumann arne-cl

  • Potsdam
View GitHub Profile
@arne-cl
arne-cl / git-selective-merge.md
Last active November 14, 2017 15:23 — forked from katylava/git-selective-merge.md
git selective merge

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

On master:

> git checkout -b temp
@arne-cl
arne-cl / epydoc_to_sphinx.sh
Last active June 11, 2021 14:04 — forked from Kami/migrate_docstrings.sh
converts epydoc docstrings to sphinx docstrings (restructuredText)
#!/usr/bin/env bash
#
# Script for migrating from epydoc to Sphinx style docstrings.
#
# WARNING: THIS SCRIPT MODIFIES FILES IN PLACE. BE SURE TO BACKUP THEM BEFORE
# RUNNING IT.
#
# Forked from: https://gist.github.com/Kami/6734885
DIRECTORY=$1