Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...
Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)
|
|
|
|
|
|
|
|
I am also commiting the manpage itself temporarily,
we should leave only the .rst in the repo!
|
|
|
|
I am also commiting the manpage itself temporarily,
we should leave only the .rst in the repo!
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
removing soledad + email from release branch created with git flow
|
|
|
|
|
|
This merge contains today's state of develop branch,
minus soledad and email components.
|
|
|
|
|
|
|
|
|
|
|
|
|