[vlc-devel] Added hotkey to cycle through audio devices

[Pierre d'Herbemont]

On Mar 24, 2008, at 4:12 PM, Dylan Yudaken wrote:
> Its now in 2 files, I wasnt sure how to combine them with git. can  
> someone explain how I would do this?


You don't have to combine them. It's fine that way. You could have  
send them using git-send-mail. However the commit log is not  
appropriate as it is the same for the two commits.

You can "git rebase -i origin" or git commit --amend (see the man  
pages) to correct the commit log and put a message a bit more  
descriptive about what is doing your patch.

Note that you should be able to send you patches with, which should be  
much more convenient for readers and you:

git format-patch -o patches && git-send-email --compose patches

( See: http://wiki.videolan.org/Git#Submitting_patches_to_the_vlc- 
devel )

Pierre.