projects
/
swc-setup-installation-test.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ea52b95
e064ce8
)
Merge branch 'master' into namespaced
author
W. Trevor King
<wking@tremily.us>
Wed, 23 Oct 2013 19:14:36 +0000
(12:14 -0700)
committer
W. Trevor King
<wking@tremily.us>
Wed, 23 Oct 2013 19:14:36 +0000
(12:14 -0700)
This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch. After this merge, future
merges from the master branch will pick up any content changes.
$ git merge --log --no-ff --strategy ours master
* master:
README.md: Remove nesting setup/
Trivial merge
projects / swc-setup-installation-test.git / commitdiff