Git graphical tools

1. GitKranken

• Landed
  • GitHub integration and other login (the button can be directly added to the ssh key on GitHub)
  • When log in using ssh key, may be in Perferences-> Authentication in specialized regenerate Gitkraken of public and private key, as with public and private key Git has the potential to generate different algorithms or secret key length, Gitkraken does not meet the requirements of error. Then choose to use the newly generated public and private key, public key and import ssh server.
• Stash
  • Equivalent to local changes are up to scratch another, so that the current branch folder recovery looks like before modification
  • If there are additions and deletions to a local file, it will fail when double-clicking the left tree branches switched to remind you to stash modify, or discard. But the switch will cause the local branch of the extra modification inexplicable, GitKranken looks like the file with a messed up?
  • Stash button looks like the top of the point, will not make you a name, put the direct current changes to Stash, as if called WIP?
  • Stash will have a mark on the right trees
• detail
  • fetch and pull
    • Point fetch all will synchronize all remote branch information, pull only fetch + merge the current branch.
    • Point push directly to the current branch commit all push to the distal
    • If the current branch when the pull not push to a remote too, it will remind you to push
  • merge
    • Select merge from the branch from the node you want to merge right-click xxx to yourbranch, if not conflict, will be done automatically
    • When resolving conflicts, if you choose to choose which changes will not affect the merge after you've put the file in the stage, and will put a new change in unstage in someone else's?
  • When you do commit, pull, push and other actions, the right side of the tree may re-adjust the layout, color and even the location of the branch has changed. This time to completely re-observe the tree just fine.
  • After the file is added to the stage, and then if there are changes, without affecting the document stage in, unstage part of this document will also be listed
• The left branch of the tree
  • LOCAL Here are all the local branch fetch too, will put out all the branches down and when not clone
  • REMOTE Here is a remote repository for all warehouses, general branch in origin below
  • All branches are using the same file directory
  • Double-click the branch is to switch to the branch, the local file directory will switch over
  • Click the branch point is the latest pointer to highlight the right side of the figure of the branch
• Right branch of FIG.
  • The leftmost label indicates the location of the new branch pointer points, computer icon on the right note is the local branch circle explanation is remote branches, and drew local and remote branch
  • There are big icons are people commit point
  • Some are solid dots merge point
  • If done before a rebase, it does not form a point merge, it will move directly to the same line
  • Generally a vertical line is a branch, but if done between different branches rebase, then these branches may be in the same line, but different newest pointer points, while the equivalent rebase GitKraken will help you to draw the two branches a line, that can be a part of two branches sometimes combined together (merge and rebase will this? just to keep more than two commit a point prior to the merger, or incorporated directly into a line?), and when one of the With the changes, it will fork out again into two
    • After the rebase, GitKraken branch of the figure will be the starting point of difference from the last two branches and a line synthesis, the so-called rebase redefine the reference point, which is the difference from the last point back into a line?
    • Another situation occurs when the merge is a fast forward, will move the pointer to the source branch target branch, it turned into a line, this time after the merge and rebase effects are similar, but there is no need to change during the target branch
  • Each branch corresponds to one line is a rope, from the newest pointer points, they may be able to carry out the entire
  • If a pull request, then there will be two names on a commit, commit is a person, a human operation
  • After each made a merge, rebase and other operations, GitKraken will adjust the bifurcation diagram, although may seem different, but in fact just done for aesthetic finishing, logic has not changed
  • Summarize again
    • That is, from top to bottom in descending order of time
    • Only a branch has not been deleted, even if merge or rebase to another branch, his upper most certainly there will be a point (may be coincidence the other branches), and displays the name of the branch in the left branch will map. If the remote branch, then the right branch name has a point icon, if it is a local branch, then the right branch name will have a computer icon.
    • Branch graphics and information origin of remote end is certainly the latest, real-time synchronization and server. Only local branch of graphics and information needs to be updated fetch it.
    • Only merge merger will lead to generate a solid point
    • Create and merge branches will lead to pull out a point from a line, and merge back at some point, there is a branch back. rebase and will lead to the final before pulling out of the base of the branch and the synthesis of a line.
    • From the uppermost end of a branch of the interface to start carry her down, you can be found all along the first commit, but did rebase before possible, so some sections may overlap with other branches.
  • The first pull the like will ask the user name display operation, generally the default git
  • Then go with the username and the repo url address before the clone input dynamic stitching pull and push, and general ** GitHub and GitLab the url is [email protected], but tfs (mercury) is rather special is their definition of the address ssh: //mercury.tfs.siemens.net: 22 / tfs / IDT / SINUMERIK% 20CLOUD / _git / cloudapps.analyzemyperformance, in front of one ssh: //, at least one back .git (this may be when .git moved into the front url / _git /), then subjected to other operations GitKraken fetch the second will be used after it automatically splicing the last entered username GitHub GitLab and style errors url (such as ssh : //[email protected]: 22 / tfs / IDT / SINUMERIK CLOUD / _git / cloudapps.analyzemyperformance.git), that is, at the end there is a .git, will lead to wrong address, so to manually direct the left REMOTE side below the tree origin Edit origin, provided url pull and push are [email protected]: 22 / tfs / IDT / SINUMERIK CLOUD / _git / cloudapps.analyzemyperformance way to avoid automatically generated GitKraken wrong url **

2. TortoiseGit

• Stash
  • And GitKranken different, you can maintain a Stash list, you can play your own name
  • And GitKranken like if there is a local additions and deletions to the file, then when you switch branches fail to remind you to stash changes. But the switch will not cause the local branch of the extra modification inexplicable, GitKranken looks like the file with a messed up?
• detail
  • When switching branch, by default checked create branch, refer to the appropriate local branch was created