Click a line in the gutter to highlight all other lines from the same commit. Open the Blame of a file through the Command Palette or when viewing a commit to see exactly which lines of the file were added by which commits.Įasily view the age, author, and commit hash of every line of code and see which lines come from the same commit with our commit color coding. With a powerful, cross-platform UI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance. Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. You can open search with Ctrl+F or through the menu: Navigate ▶ Search. Complex search queries can be constructed using and, or and () symbols.įor example min-parents:2 author:jskinner path:tests/* (bug fix or test) will search for a merge commit from jskinner inside the tests directory that contain the words "bug" and "fix" or the word "test". Search for commit messages, commit authors, file names, and wildcard patterns. Use find-as-you-type search to dig up the exact commit you're looking for. Use Ctrl+S or the Save button to save your merged file. The same text editing functionality as Sublime Text is also available for more complicated merges.Ĭlicking on the header in the middle pane will switch between the editable merge results and the base file. In the center pane is the resolved text, with buttons to choose between your changes or theirs. On the left are your changes and on the right are theirs. ![]() The Integrated Merge Tool allows you to resolve any merge conflicts directly in Sublime Merge, rather than having to open up your editor of choice.Ĭonflicts are presented with a 3-pane view. Stage Files, Hunks and Lines with no waiting - Sublime Merge is really, really fast. A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. Meet a new Git Client, from the makers of Sublime Text. Also, sort by any field and other bells and whistles.ĭownload Windows executable (zip archive).ĭownload Mac OSX eecutable (zip archive). It makes easy things like finding all strains with dpy-5 and an unc them. It wouldn't be hard to configure it to view any tab-delimited text data format. Strain Collection Searching: software that lets you search tab-delimited data sets, currently specifically tailored for the Thomas lab worm strain, allele, and oligo data sets. You may also need to get the Java Runtime Environment from the Sun site (see link near top of this page). Karkinos: a way-cool cancer growth simulator that is useful for teaching. You may also need to get the Java Runtime Environment from the Sun site (see link near top of this page).ĭownload data collection timer (Etho) for Windows (zip archive, updated 8/6/03).ĭownload data collection timer (Etho) for Mac OSX (sitx updated 8/6/03).ĭownload data collection timer (Etho) for Linux (zip archive, updated 8/6/03). Useful for recording and analyzing events a laboratory setting. You may also need to get the Java Runtime Environment from the Sun site (see link near top of this page).Įtho: a highly configurable keyboard-driven event timer. GFF Parser: a simple program that lets you quickly parse data from GFF 2.0 files (which are flat-text genome data files). This download is from the Sun website and is easily installed according to their directions. ![]() If you have Mac OSX you should already have the Mac JRE but you may want to try to update to the newest release.ĭownload JRE for Windows, Linux, or Solaris (and redirection for Mac). Java Runtime Environment (JRE): this is necessary to run any of my programs, which are all written in Java. If not, you will need Stuffit Expander or a Zip expander (Unix). ![]() Most downloads will unpack automatically or after double-clicking the downloaded file. All software downloads come with files that explain installation after unpacking.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |