I spend a lot ofTime working with git each day. Most of that time is spent working with git onThe command line, with the exception of Sublime Merge and Fork whichI prefer for visual merging and staging of large or complex changesets.I find working with git from the shell to be a more customizable experienceThan working in a graphical git client. You can perform common unixisms likePiping its output to another command, or build your own macros that compose gitFunctionality to automate things in your everyday workflow.Either the zsh git plugin or bash-it is a good place to start if you wantA comprehensive set of shell aliases for git. Improve status view cursor location logic.Most of the aliases providedDon’t compose any behavior, but they save you a lot of characters for commandsYou type all the time. (Issue 10) - Commit message is empty on merge commits. Git-flow issues.Most error prone and automate those first. Command View Commit History, Current Branch: git log: View Commit History, Different Branch: git log branch Single Line Logs: git log -oneline: List Changed Files in Log: git log -name-status: List Diff Stats in Log: git log -stat: View Commits that Changed String Occurrences: git log -S string View Commits that Changed Regex Match.There is always room forDiff tool is very powerful and obviously easy to use. I try to identify the things in my work that I do most often or those that areSublime Merge - A Git client from the makers of Sublime Text.
#Sublime merge log code#
TypeScript 3.To going back and forth on pushing/pulling code and logging into servers in the terminal.Running git diff in Sublime Text shows M at end of line, doing the same in a terminal window omits the M as it should).
#Sublime merge log download#
You can download and read more about the Git Client from the Sublime Merge website. Now they have invited other users to try it as well. Sublime Merge is in its early stages and has only been used by the makers and a small team of beta testers. For business licenses, subscription is available. Individual licences are lifetime with three years of updates included. However, Git itself, is directly used in Sublime Merge for repository mutating operations like staging, committing, checking out branches, etc. It uses a custom implementation of Git for reading repositories that drives high performance functionalities. Sublime Merge uses the same lingo as Git, and it doesn’t make use of any state beyond Git itself. Hovering over the buttons will show you which command it will run.
Working with Sublime Merge means you’re working with the real Git, and not just a simplified version. Complex search queries can also be constructed using ‘and’, ‘or’, and ‘()’ symbols for deep searches within folders. You can search for commit messages, commit authors, file names, and even wildcard patterns. Sublime Merge features find-as-you-type search to find the commit with exact matches.
The smerge tool that comes with Sublime Merge can be used to open repositories, blame files, and search for commits. So either the GUI or the command line can be used for different functions, the choice is yours. All repository changes are updated live and things work the same from the command line as they would from the UI. Sublime Merge will work hand-in-hand with the command line. The Command Palette allows quick access to a large set of Git commands and is triggered by Ctrl+P. Space bar can toggle expansion, and Enter can stage/unstage hunks. The Tab key can be used to navigate through different parts of the application. There are also good keyboard usability options. It can be done simply by selecting any two commits in Sublime Merge with Ctrl+Left Mouse to show the diff between them. This includes renames, moves, resolving conflicts or just looking at the commit history. For cases where necessary, Sublime Merge will display exactly which individual characters have been changed for a commit.
0 kommentar(er)
