They make lovely equipment, but what I really like is the name.
#Sublime merge cmdlone software
simply the best and most well thought out piece of software i've used.Įdit: i'm just scratching the surface on what magit can do.There's a company that makes photography accessories, called Really Right Stuff. It's hard to overstate just how well everything flows in magit and i've never heard anyone say anything bad about it other than something like I wish it wasn't tied to emacs. enter opens the file to edit or more generally does an action like view the commit under the cursor if you are in a the log graph and q will "quit" out and pop the interaction back to the log graph. l to "inline diff" opens a diff in a new file whereas tab just opens and closes sections on the main dashboard. tab in magit expands short diffs from the main status page where you can stage or unstage selections or get an overview of the changes. Stuff that takes one keystroke on magit is clunkier in gitsavvy. need to go to insert mode to actually interact with it (might be configurable and fixable) So I just tried it out and it's noticeably more irritating than magit on first brush:ĭoesn't work well with vim plugins. la is log all branches and everything in the log is interactive. bb is checkout a branch and it usually pre-populates the thing you are on if that is applicable. The trick is everything follows that basic form where starts a command, pops up a menu and shows the next options but the general trend is that it usually is the same two letters. Q or escape goes back a "page" like from viewing the log to go back to the staging area
![sublime merge cmdlone sublime merge cmdlone](https://i1.wp.com/www.pcsoftdownload.com/wp-content/uploads/2020/07/Sublime-Merge-latest-version.png)
S and u to stage and unstage chunks of text/files/lines ? shows help(and every command pops up a menu with options) magit is simply the finest complete git gui that does most things seamlessly.
#Sublime merge cmdlone how to
If you know the bare basics of emacs(like a few file commands and how to exit), magit and vim that is a huge productivity win. I can firmly say that installing emacs and doom emacs is well worth it solely for the magit interface. I've actually found this to be a better experience compared to using the -p option. This way, I can stage my changes and still exclude extraneous changes or debug statements I've added to the code. That basically updates the numbers in the line that starts with to account for the changes in the number of added and removed lines introduced by the edit.
![sublime merge cmdlone sublime merge cmdlone](https://insmac.org/uploads/posts/2019-04/1554722702_sublime-merge_02.jpg)
In addition to what I wrote above using git apply -cached, I can actually edit hunks from within vim and then filter the hunk (with the diff header) through the recountdiff utility that comes with patchutils. > Does any GUI offer `-p` in `git commit` and `git stash`? I literally use it 10s times per day, can't live without it once I started using it. Typing my commit message at the top and filtering it through I can commit from within vim by reading the verbose status output by running:
![sublime merge cmdlone sublime merge cmdlone](http://licensesoft.vn/pic/Product/images/Sublime-Merge-performance-03.png)
If I want to unstage it, I can press u to restore the hunk I just filtered and then run I can stage hunks by yanking the diff header (excluding the line that starts with and pasting it above the hunk I want to stage and then filtering the hunk through: I actually use git via a TUI (text user interface) by using vim to either read from or write to git commands. I may be in between the GUI and CLI camps. I never have any ambiguity about what it's going to do. I'm comfortable with terminal commands but it's the terminal with a very nice diff view, clean graphs, easier text editing, etc. Sublime Merge will then run it with the exact args you entered, show you the exact CLI command it used, and will show you the exact output.įor me Sublime Merge is strictly better than a terminal. If you want to make a stash with untracked files for example, you just hit the arrow next to "Stash" and get a dropdown with command line args and descriptions for what they do. It doesn't mess with your tree directly, every action maps to a normal human readable git command.
![sublime merge cmdlone sublime merge cmdlone](https://windows-cdn.softpedia.com/screenshots/Sublime-Merge_5.png)
Hover over any button and you get the exact git command it will run. I cannot imagine using git and only being able to push entire files.Īnd for the record, I use Sublime Merge and it does a great job mapping to terminal commands. The entire point of a GUI is you get the behavior of -p and -dry-run in a much richer context! I've never seen a GUI that doesn't let you very easily select specific lines for commits and I honestly wouldn't use one that didn't.