diff options
| author | David Runge <dave@sleepmap.de> | 2019-04-09 00:54:11 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2019-04-09 00:54:11 +0200 |
| commit | 3a8e03d9adc84dc71d401f4255b691957e5d0a4a (patch) | |
| tree | db1c917415a84335d370c552d5165e3bdb9970fe | |
| parent | a75a7707850aae3fc568416820642bc649f59f38 (diff) | |
| parent | 64bfe65b131d00292929021873176f78ba34d04a (diff) | |
| download | dotfiles-3a8e03d9adc84dc71d401f4255b691957e5d0a4a.tar.gz dotfiles-3a8e03d9adc84dc71d401f4255b691957e5d0a4a.tar.bz2 dotfiles-3a8e03d9adc84dc71d401f4255b691957e5d0a4a.tar.xz dotfiles-3a8e03d9adc84dc71d401f4255b691957e5d0a4a.zip | |
Merge branch 'master' of git.sleepmap.de:config/dotfiles
* 'master' of git.sleepmap.de:config/dotfiles:
.config/git/config: Automatically signing commit, when writing with message (git c).
.config/packages-aur.txt: Adding python-nose2.
.config/packages-community.txt: Adding link, removing paulstretch, moving python-nose2 to AUR.
| -rw-r--r-- | .config/git/config | 4 | ||||
| -rw-r--r-- | .config/packages-aur.txt | 1 | ||||
| -rw-r--r-- | .config/packages-community.txt | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.config/git/config b/.config/git/config index 5aae96f..06c6e88 100644 --- a/.config/git/config +++ b/.config/git/config @@ -27,7 +27,7 @@ b = branch -v # branch (verbose) # commit - c = commit -m # commit with message + c = commit -S -m # commit with message ca = commit -am # commit all with message ci = commit # commit amend = commit --amend # ammend your last commit @@ -116,7 +116,7 @@ # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject # instead of a/b/c/d as prefixes for patches mnemonicprefix = true - algorithm = patience + algorithm = patience [rerere] # Remember my merges # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ diff --git a/.config/packages-aur.txt b/.config/packages-aur.txt index 3b2ac50..9dc5aa3 100644 --- a/.config/packages-aur.txt +++ b/.config/packages-aur.txt @@ -18,6 +18,7 @@ patroneo-git pd-git prosody-mod-admin-message-hg prosody-mod-admin-web-hg +python-nose2 python-osc realtime-suggestions roundcube-rcmcarddav diff --git a/.config/packages-community.txt b/.config/packages-community.txt index 60cfe44..8e256d8 100644 --- a/.config/packages-community.txt +++ b/.config/packages-community.txt @@ -89,6 +89,7 @@ libmusicxml liboggz libsmf lilv +link linuxsampler lmms lsp-plugins @@ -120,7 +121,6 @@ osmid padthv1 patchage patchmatrix -paulstretch pd pd-lua plowshare @@ -150,7 +150,6 @@ python-ly python-micawber python-natsort python-nose-progressive -python-nose2 python-orderedmultidict python-phpserialize python-piexif |