Skip to content
Snippets Groups Projects

added python api wrapper

Merged gitlab-qa-bot requested to merge github/fork/Itxaka/master into master

Created by: Itxaka

Tried again, sorry for the inconvenience.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Created by: Razer6

    @jacobvosmaer Ping - Looks better now :smile:

    By Administrator on 2013-08-06T19:29:49 (imported from GitLab project)

    By Administrator on 2013-08-06T19:29:49 (imported from GitLab)

  • Created by: coveralls

    Coverage Status

    Coverage decreased (-0%) when pulling 601fc217451f96b0f9954f38efbb0b8b8ee29d6b on Itxaka:master into 27b7aedd on gitlabhq:master.

    By Administrator on 2013-08-06T19:54:45 (imported from GitLab project)

    By Administrator on 2013-08-06T19:54:45 (imported from GitLab)

  • Created by: axilleas

    Wrong url, I guess :p

    By Administrator on 2013-08-07T07:13:18 (imported from GitLab project)

    By Administrator on 2013-08-07T07:13:18 (imported from GitLab)

  • Created by: Itxaka

    Oh god why :cry: Ok, I'll push it next week, when Im less obtuse. Sorry for the inconvenience guys.

    By Administrator on 2013-08-07T07:16:44 (imported from GitLab project)

    By Administrator on 2013-08-07T07:16:44 (imported from GitLab)

  • Created by: axilleas

    Lol, no don't close it! Open it again please. You can do it!

    Here is a quick how to on git squash/rebase, based on your case:

    1. Make the appropriate changes again.
    2. git add doc/api/README.md
    3. git commit -m 'Fix wrong uri'. Run git log and see that your commit is there.
    4. git rebase -i HEAD~2 (this runs rebase on your two latest commits)
    5. Replace pick with squash on the commit of step 3, save and exit.
    6. A new editor will appear. Remove the second commit message, save and exit.
    7. Run git log again and see that you latest commit is gone, or rather squashed into the previous one.
    8. git push -f your_remote master
    9. Congratulations you learned basic rebase! :dancers:

    A few notes:

    1. When contributing to a project it's better to run your changes in a different branch.
    2. git push -f and rebase in general is highly NOT recommended if others have already pulled your previous commits, as it rewrites history. It's cool in these cases where you submit a patch and others can do code review ;)

    So now, please open it again and retry! We'll be here if anything goes wrong.

    PS: Should we include this mini how to in the guidelines somehow?

    By Administrator on 2013-08-07T07:33:15 (imported from GitLab project)

    By Administrator on 2013-08-07T07:33:15 (imported from GitLab)

  • Created by: Itxaka

    Oh wow, I can't believe it actually worked this time! I swear I tried the same before and it created more commits instead of squashing them.

    Thanks @axilleas !

    By Administrator on 2013-08-07T07:49:35 (imported from GitLab project)

    By Administrator on 2013-08-07T07:49:35 (imported from GitLab)

  • Created by: axilleas

    Cool! :beer:

    By Administrator on 2013-08-07T07:52:32 (imported from GitLab project)

    By Administrator on 2013-08-07T07:52:32 (imported from GitLab)

  • Created by: coveralls

    Coverage Status

    Coverage decreased (-0%) when pulling bc3a4d31 on Itxaka:master into 27b7aedd on gitlabhq:master.

    By Administrator on 2013-08-07T08:09:32 (imported from GitLab project)

    By Administrator on 2013-08-07T08:09:32 (imported from GitLab)

  • Created by: coveralls

    Coverage Status

    Coverage decreased (-0%) when pulling bc3a4d31 on Itxaka:master into 27b7aedd on gitlabhq:master.

    By Administrator on 2013-08-07T08:15:25 (imported from GitLab project)

    By Administrator on 2013-08-07T08:15:25 (imported from GitLab)

Please register or sign in to reply
Loading