Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[music videos] adding "All albums" option #6871

Closed
wants to merge 2 commits into from
Closed

[music videos] adding "All albums" option #6871

wants to merge 2 commits into from

Conversation

sialivi
Copy link
Contributor

@sialivi sialivi commented Apr 3, 2015

Adds the missing "All albums" option when browsing Music Videos by Artist, which was requested in this thread.

Adds the missing "All albums" option when browsing Music Videos by Artist, which was requested in http://forum.kodi.tv/showthread.php?tid=185443
[music videos] adding "All albums" option
@un1versal
Copy link
Contributor

One of these commits is too many

@Paxxi
Copy link
Member

Paxxi commented Apr 4, 2015

To clarify what I think @universal meant is that you should squish your commits into one.

@sialivi
Copy link
Contributor Author

sialivi commented Apr 6, 2015

I might need some guidance; I haven't used Git before, so unfortunately I don't know how to do that (without possibly making an even bigger mess). Sorry for the inconvenience.

@un1versal
Copy link
Contributor

@sialivi There's a few ways to do this. One way is.

1 ) open a terminal in your git master branch and issue these commands:

git checkout master
git rebase -i HEAD~2

shortly after, your text editor will open up with the two commits ontop and some comments below:
Hint: read comments

pick   [music videos] adding "All albums" option            5f8ada7
pick   Merge pull request #1 from sialivi/sialivi-patch-1   268444c

# Rebase 5f8ada7..268444c onto befef23
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

pay attention to this part on that text file

_# If you remove a line here THAT COMMIT WILL BE LOST._

  1. So you remove the line you dont want from that text file and save it then close editor down.
    _Hint:_ remove this line _Merge pull request XBMC core Portuguese translation based on English commit 1ee638d8b22a3a5440e57a9384590558925e12ef #1 from sialivi/sialivi-patch-1 268444c_

Git will do some work and that removes the unwanted commit.

Then push chnages which updates this PR automatically by issuing: :

git push -f

_note:_
Its good parctice to sync your fork/branch by rebasing onto master origin and push so it updates your branch that should make sure your chnages are ontop of latest master.

git pull --rebase master origin
git push -f

that should do it, there's several ways how to do this I suggest you brush up by doing some reading and practising.

@sialivi
Copy link
Contributor Author

sialivi commented May 25, 2015

@UniversaI Sorry for the late reply, I'm hospitalized for an extended period of time. Thanks for the detailed steps, unfortunately I'm not set up to perform them from my tablet. I see there's already a rc1 ticket, so chances are that I won't be discharged from hospital in time to fix this. Maybe it's possible for some other kind soul to do it.

@un1versal
Copy link
Contributor

Ill see about cherry picking these commits and pushing them on your behalf.

@sialivi
Copy link
Contributor Author

sialivi commented Jul 13, 2015

@UniversaI That would be most appreciated, if it's not too late now that RC2 is out.

@un1versal
Copy link
Contributor

@sialivi Its not up to me I will backport to isengard if asked IMO features wont be accpted after feature freeze and you took your sweet time with this.

See #7499 and close this if you want.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants