Patches can be created from either a commit(s) or a file(s). Patch files can be used to distribute changes that a given user would like to make to a particular revision without codifying it onto a git server. PatchĪ patch, or patchfile, is a file describing changes between 2 files. Use the top toggle button to switch between Diff View, which shows the selected commit’s changes to the file, and the File View, which shows the file’s state at that commit, including the blame info. File History shows that file’s commit history on the left.įile Blame will color code the commit author of each line or hunk. You may also click on a commit in the graph and then right click a file to access File History or File Blame. To access either option, click to view the file diff and the options will appear in the upper right. Note: Are you looking to diff branches? Consider using the Cmd/Ctrl key to select the head commits of each branch.įile History and File Blame information display in the same view. This will produced a combined diff, which lists all files that were added, modified, renamed or deleted between the selected commits in the Commit Panel. Use the Shift or Cmd/Ctrl key to select multiple commits in the graph. Here are some examples for each operating system: Mac OS Ĭmd = open -a Meld -args "$LOCAL" "$REMOTE" Linux Ĭmd = meld "$LOCAL" "$REMOTE" Windows Ĭmd = "C:\Program Files\Meld\Meld.exe" "$LOCAL" "$REMOTE" gitconfig file and add these additional lines to use that diff tool. If you would like to use another diff tool, navigate to Preferences General and set the Diff Tool to Git Config Default. If your diff tool from the list above is installed and is not showing up in the dropdown, then look for an option to install command line tools. GitKraken Client currently only supports the following diff tools: Note, you may select deleted lines with your mouse from split view.Ĭonfigure your preferred external diff tool from Preferences General: Split view will show a side by side diff comparing how the file looked before (left), and how it looks after the change (right). Inline view will show the diff within the context of the entire file. Hunk view will show the diff as blocks, without the context of the rest of the file. If you have two commits selected, GitKraken Client shows the difference between the two commits.Īdditionally, select multiple commit rows in the graph using Shift Click to show its merged diff:
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |