Search Results for "diff merge"

...Note-taking, wysiwyg or markdown, with todo lists, etc. Auto-push to the remote repository (can be disabled in settings) Auto-fetch, and indication if the pull is possible. Standard git features, such as branch, merge, push, pull, tag, stash. History browser, builtin pragma-merge diff and merge tool (external tool may be used instead) Settings, handling repository, branches, remotes, cloning as well as software preferences. Fully git compatible, try it, and use together with other clients. Aiming to be the opposite to how many beginners perceive git.