chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ee44bd0
dcb3df3
)
Merge remote-tracking branch 'remotes/dgit/dgit/sid'
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:04:22 +0000
(20:04 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:04:22 +0000
(20:04 +0000)
Done with merge -s ours. We are a descendant of this, logically
speaking, although the archive version is missing .gitignore.
Trivial merge