CHANGE USER SUBLIME MERGE UPDATE THE WORKING

Change User Sublime Merge Update The Working

This is a short TODO list of what needs to happen. SublimeGit is going open source. If history is linear and HEAD is an ancestor of next, update the working tree and. Apply to the working tree and the index the changes introduced by the second last commit pointed to by master and by the last commit pointed to by next, but do not create any commit with these changes. Git cherry-pick -n master1 next.

(Specifically, some fonts)- File encoding issues in Git: Blame and Git: Diff. (Issue #10)- Commit message is empty on merge commits.- Binary files and diffs can cause issues. 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).- Improve reload logic to get rid of need to restart Sublime Text after some updates.- Improve status view cursor location logic. (Related to issue #72)- Git: Show syntax highlighting (Related to issue #72)- Improved syntax highlighting for Git: Blame.- Alternative short syntax for Git: Blame.- Allow for -word-diff option in diff view.- Handle username/password/passphrase freezes better.- Fix some whitespace problems (It seems like the whitespace = cr-at-eol setting is getting ignored, and probably other whitespace settings too.

In the bottom of the view there should be a text which allows for loading X more lines (if necessary).List of local and remote branches, with meta-information for each one, as well as easy navigation. Pressing space should append the commit to an already existing commit view and scroll the view.It should also be possible to refresh the log by pressing r. Pressing enter should open a commit in the commit view, and show a color-coded diff. Make sure the branches are colored in the correct way, if possible (use the ascii color codes and make a custom colorscheme for the view).It should be possible to walk through the graph using n and p, and maybe jumping to merges and branches in an intelligent way.