Tig Usage Git Diff
Git show de754f5; Show Changes. The git diff command shows changes between commits, branches, and more. You can read more fully about it through the Git documentation. Compare modified files that are on the staging area. Git diff -staged Display the diff of what is in a-branch but is not in b-branch. Git diff a-branch. Disable diff move/copy detection by default, boosting diff performance on larger projects. Use git config diff.renames option (Git-wide) to set your preferred behavior. Environment variable TIGDIFFOPTS can be used to restore the old behavior. Fix manual keybinding for stage-single-line.
Tig Usage Git Different
Longer than usual post, so added a TLDR; version at the bottom The problem The first few months using Git, I used to frequently jump back and forth between using Git Bash and SourceTree. I really wanted to get in the habit of using git at the console, but some things just felt easier with a GUI that I could scroll and click my way through.One of those paint points was viewing repository history - the commit tree. I knew I could get a really customized history view on the console with some magic incantation of git log and it’s many MANY argument options. But with log it was a lot of trial and error:. Run git log -oneline -graph -decorate -abbrev-commit -all -20.
Oh wait, I’ve got more than 20 commits on my branch. I wanted to see where my branch split from master but that isn’t included in here.
Run git log -oneline -graph -decorate -abbrev-commit -all -30. Still don’t see master! Git log sorts commits in history by when they were created, it looks like other branches had commits created after the tip of master. First lets set an alias lg for that command so I don’t have to type it out each time. Then lets not give it a count argument, instead pipe the output to less so I can see the history a page at a time:git lg less.
Great, two pages down I finally see master but I hit the page key one too many times and now I can’t scroll back up - Aaaargghhhhhhhh!!!!I know today that there’s a better way to do what I was trying to do here, but just including this as an example of why I started looking for alternative solutions. The better way in case any one is curious:git lg $(git merge-base master feature).feature and the solutiontig is described as a ‘ncurses-based text-mode interface for git’. I already had my head buried in a few new terms/areas at the time and didn’t want to add ncurses to the list, so I’ve never really looked up what that means. A quick skim of the Wikipedia entry today tells me its a library for writing TUIs (Terminal User Interfaces) - that checks out with my experience. Tig is a console utility that hides a crazy amount of GUI-like functionality underneath. You already have tig installed“Uhh what now?!” is probably what you are thinking. But its true - Git Bash actually comes with a bunch of Unixy tools ported to Windows.
You can find what else you’ve already got by looking in the /usr/bin folder in your Git for Windows installation. Tig just happens to be one of them - speaks to its utility if its included by default right?WORKS ON MY MACHINE DISCLAIMER: You can even use tig if you’re a PowerShell user - just add that location to your PATH variable. Main viewSo if you’re following along, run tig in Git Bash / PowerShell while inside a git repository folder.
When run without any arguments, tig launches straight into the main view. This view is the commit history for the repository, but scrollable, searchable and clickable (or ENTER-able for the KBD warriors). ShortcutOperationj / Down ArrowMove down to next commitk / Up ArrowMove up to previous commit/Search for keyword in logEnterOpen the diff view for this commitqGo back to previous view / Quit tig if no previous viewYou can configure this view to periodically refresh so you are always viewing an up-to-date log. More on this further below in the customization section.tig is a stand-in replacement for git log, and so will accept any parameters that you would have used with that command. For example, you can view history for a single file or directory by supplying the path as an argument:tig -./src/app/Program.cs Diff viewWhen you hit ENTER on a commit in the main view, tig opens a nice diff of that commit on the side (or bottom depending on window width). There’s a few things you can do here too:.
Hitting ENTER on a filename, will jump down to the diff for that specific file. Hitting will increase the number of lines of context displayed around changed lines.
It changes the value 'Enable' in the registry key 'HKEYLOCALMACHINESOFTWAREMicrosoftWindowsCurrentVersionAutoRotation'.However, after restarting my unit with the Enable value set to 0, if I change the 'Enable' value back to 1, the screen doesn't auto rotate. Hello,Is there a way to enable or disable the screen auto-rotation on Windows 8 (win32 api)?In Control Panel, under Screen Resolution, there's an option named 'Allow the screen to auto-rotate'. Omnisite unit enable key.
goes the other direction.The diff view is a first class citizen in tig, so you can actually have it fill the screen instead of being a split window by pressing d on a line containing a commit SHA. Yep, you can actually hit d on any line containing a SHA - and tig will open the diff for that SHA. Other viewsThe main and diff views are the ones I use the most, but there’s a few more in tig that come in handy. Tree viewHit t on a line with a commit SHA and this drops you into the tree view. This is a directory browser view of the repository as of that commit hash.
I find this one interesting but not terribly useful - or atleast I haven’t found a good use for it yet. Stage viewHit s anywhere inside tig and it takes you the stage view - a nicely formatted view of git status. Move up/down to select a file and hit u to stage/unstage it. You can even stage/unstage parts of files by from the diff for the file.
Hit c to commit. Stash viewHit y to view any stashes you have saved. All the same shortcuts from above apply ( d to view a diff, t to view the directory tree, etc.). References viewHit r to go into the references view or what you would usually get from git branch. Hitting Enter here shows you a log of the branch you have selected. Cherry-picking and mergingFrom the main view, you can cherry-pick commits onto your currently checked-out branch by just hitting C on the commit line.You can similarly merge branches into your active branch by hitting M on the branch tip - can’t get any easier than that. Customizing the viewYou can change how tig displays information using a few shortcuts: ShortcutOperationSHIFT+AToggle different styles for author namesSHIFT+Toggle styles for the graphics (you’ll want to change this as the default doesn’t render well)SHIFT+#Toggle line numbers (you can jump to a line with:)SHIFT+XToggle commit SHAsSHIFT+DToggle date display formatsOf course you don’t want to have to set this each time you open tig.
You can create a.tigrc file with your favoured options. Here’s mine: # General settingsset tab-size = 4set ignore-case = trueset refresh-mode = periodicset refresh-interval = 1set mouse = trueset mouse-scroll = trueset diff-context = 5set line-graphics = ascii# Main view settingsset main-view = line-number:yes,interval:1 date:relative id:yes author:full commit-title:yes,graph:yes,refs:yes# Colorscolor cursor black greenWhere can I find out more?The tig doc and are excellent and are very short reads, so I would highly recommend them.The cheat sheet should be helpful for the first few weeks. The shortcuts are fairly easy to remember so they’ll get etched in memory quite quickly. Too long, didn’t read versiontig is a Terminal UI application that lets you interact with a git repository in a number of ways. You already have it installed, so you should give it a try!Here’s a recording of what tig can do.
Git diff - This form is to view the changes you made relative tothe index (staging area for the next commit). In otherwords, the differences are what you could tell Git tofurther add to the index but you still haven’t. You canstage these changes by using. Git diff -no-index - This form is to compare the given two paths on thefilesystem. You can omit the -no-index option whenrunning the command in a working tree controlled by Git andat least one of the paths points outside the working tree,or when running the command outside a working treecontrolled by Git.
Git diff -cached - This form is to view the changes you staged for the nextcommit relative to the named. Typically youwould want comparison with the latest commit, so if youdo not give, it defaults to HEAD.If HEAD does not exist (e.g.
Unborn branches) and is not given, it shows all staged changes.-staged is a synonym of -cached. Git diff - This form is to view the changes you have in yourworking tree relative to the named. You canuse HEAD to compare it with the latest commit, or abranch name to compare with the tip of a differentbranch. Git diff - This is to view the changes between two arbitrary. This is synonymous to the previous form. If onone side is omitted, it will have the same effect asusing HEAD instead. This form is to view the changes on the branch containingand up to the second, starting at a common ancestorof both.
Git Commit
'git diff A.B' is equivalent to'git diff $(git merge-base A B) B'. You can omit any oneof, which has the same effect as using HEAD instead. P -u -patchGenerate patch (see section on generating patches).This is the default.s -no-patchSuppress diff output. Useful for commands like git show thatshow the patch by default, or to cancel the effect of -patch.U -unified=Generate diffs with lines of context instead ofthe usual three. Implies -patch.Implies -p.output=Output to a specific file instead of stdout.output-indicator-new= -output-indicator-old= -output-indicator-context=Specify the character used to indicate new, old or contextlines in the generated patch.
Normally they are +, - and' ' respectively.rawGenerate the diff in raw format.patch-with-rawSynonym for -p -raw.indent-heuristicEnable the heuristic that shifts diff hunk boundaries to make patcheseasier to read. This is the default.no-indent-heuristicDisable the indent heuristic.minimalSpend extra time to make sure the smallest possiblediff is produced.patienceGenerate a diff using the 'patience diff' algorithm.histogramGenerate a diff using the 'histogram diff' algorithm.anchored=Generate a diff using the 'anchored diff' algorithm. For instance, if you configured the diff.algorithm variable to anon-default value and want to use the default one, then youhave to use -diff-algorithm=default option.stat=,Generate a diffstat. By default, as much space as necessarywill be used for the filename part, and the rest for the graphpart. Maximum width defaults to terminal width, or 80 columnsif not connected to a terminal, and can be overridden.
The width of the filename part can be limited bygiving another width after a comma. The widthof the graph part can be limited by using-stat-graph-width= (affects all commands generatinga stat graph) or by setting diff.statGraphWidth=(does not affect git format-patch).By giving a third parameter, you can limit theoutput to the first lines, followed.
Ifthere are more. These parameters can also be set individually with -stat-width=,-stat-name-width= and -stat-count=.compact-summaryOutput a condensed summary of extended header information suchas file creations or deletions ('new' or 'gone', optionally '+l'if it’s a symlink) and mode changes ('+x' or '-x' for addingor removing executable bit respectively) in diffstat. Theinformation is put between the filename part and the graphpart. Implies -stat.numstatSimilar to -stat, but shows number of added anddeleted lines in decimal notation and pathname withoutabbreviation, to make it more machine friendly.
Forbinary files, outputs two - instead of saying0 0.shortstatOutput only the last line of the -stat format containing totalnumber of modified files, as well as number of added and deletedlines.X -dirstat=Output the distribution of relative amount of changes for eachsub-directory. The behavior of -dirstat can be customized bypassing it a comma separated list of parameters.The defaults are controlled by the diff.dirstat configurationvariable (see ).The following parameters are available. ChangesCompute the dirstat numbers by counting the lines that have beenremoved from the source, or added to the destination. This ignoresthe amount of pure code movements within a file.
In other words,rearranging lines in a file is not counted as much as other changes.This is the default behavior when no parameter is given. LinesCompute the dirstat numbers by doing the regular line-based diffanalysis, and summing the removed/added line counts. (For binaryfiles, count 64-byte chunks instead, since binary files have nonatural concept of lines). This is a more expensive -dirstatbehavior than the changes behavior, but it does count rearrangedlines within a file as much as other changes.
Git Diff Revision
The resulting outputis consistent with what you get from the other -.stat options. FilesCompute the dirstat numbers by counting the number of files changed.Each changed file counts equally in the dirstat analysis. This isthe computationally cheapest -dirstat behavior, since it doesnot have to look at the file contents at all.
CumulativeCount changes in a child directory for the parent directory as well.Note that when using cumulative, the sum of the percentagesreported may exceed 100%. The default (non-cumulative) behavior canbe specified with the noncumulative parameter. An integer parameter specifies a cut-off percent (3% by default).Directories contributing less than this percentage of the changesare not shown in the output.