chiark
/
gitweb
/
~ian
/
ian-dotfiles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e4e713
2914726
)
Merge branch 'anarres-vanilla'
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 16 Dec 2015 22:27:22 +0000
(22:27 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 16 Dec 2015 22:27:22 +0000
(22:27 +0000)
-s ours (ie, discard those changes)
Trivial merge
~ian / ian-dotfiles.git / commitdiff