This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
package uk.org.backstage; | |
import com.vaadin.annotations.VaadinServletConfiguration; | |
import com.vaadin.data.Container; | |
import com.vaadin.data.util.IndexedContainer; | |
import com.vaadin.event.ItemClickEvent; | |
import com.vaadin.event.ShortcutAction; | |
import com.vaadin.server.VaadinRequest; | |
import com.vaadin.server.VaadinServlet; | |
import com.vaadin.ui.Button; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
function usage { | |
echo "USAGE: git merge-svn <from> [<to>]" | |
echo "" | |
echo " from The branch name to be merged FROM" | |
echo " to Optional branch name to be merged onto. Default: HEAD" | |
echo "" | |
} |