In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent. When a merge commit is included by --show-pulls, the merge is treated as if it "pulled" the change from another branch. When ...
Graphical alternative to git-commit git-clean[1] Remove untracked files from the working tree git-clone[1] Clone a repository into a new directory git-commit[1] Record changes to the repository git-describe[1] Give an object a human readable name based on an available ref ...
With -n or --no-stat do not show a diffstat at the end of the merge. --squash --no-squash Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move theHEAD, or record$GIT_DIR/MERGE_HEAD(to...
Seeing really is believing. Get information on any branch or commit with a single click. Git and Hg on your desktop A fully-featured GUI that offers an efficient, consistent development process right out of the box. Works with Git and Mercurial. Commit with Confidence Visualize your work and ...
Git will mark the conflicts in the working tree. Edit the files into shape and git add them to the index. Use git commit to seal the deal. You can work through the conflict with a number of tools: Use a mergetool. git mergetool to launch a graphical mergetool which will work you...
log.showroot If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like git-log(1) or git-whatchanged(1), which normally hide the root commit will now show it. True by default. log.mailmap If true, makes git-...
“three-tree” architecture and the importance of its index file. Understanding these additional Git internals will build on the foundational knowledge that will make you a more effective Git user and will provide new insights as you explore various Git operations fronted by the graphical Git ...
GitX is a graphical client for the git version control system, written specifically for OS X Mavericks. This means that it has a native interface and tries to integrate with the operating system as good as possible. Examples of this are drag and drop support and QuickLook support. Legacy bu...
TREESAME, so the others do not appear. Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected. --full-history with parent rewriting Ordinary commits are only included if they are !TREESAME (...
GitX is a graphical client for thegitversion control system, written specifically for OS X Mavericks. This means that it has a native interface and tries to integrate with the operating system as good as possible. Examples of this are drag and drop support and QuickLook support. ...