Make tig handle GIT_DIR better
[tig] / manual.txt
CommitLineData
d839253b
JF
1The tig Manual
2==============
3Jonas Fonseca <fonseca@diku.dk>
4
5This is the manual for tig, the ncurses-based text-mode interface for git.
6Tig allows you to browse changes in a git repository and can additionally act
7as a pager for output of various git commands. When used as a pager, it will
8display input from stdin and colorize it.
9
10When browsing repositories, tig uses the underlying git commands to present
11the user with various views, such as summarized commit log and showing the
12commit with the log message, diffstat, and the diff.
13
9783cb12 14ifndef::backend-docbook[]
2bc4f7bd
JF
15*Table of Contents*
16
9783cb12
JF
17include::manual.toc[]
18endif::backend-docbook[]
19
20[[calling-conventions]]
d839253b
JF
21Calling Conventions
22-------------------
23
9783cb12 24[[pager-mode]]
d839253b
JF
25Pager Mode
26~~~~~~~~~~
27
28If stdin is a pipe, any log or diff options will be ignored and the pager view
29will be opened loading data from stdin. The pager mode can be used for
30colorizing output from various git commands.
31
32Example on how to colorize the output of git-show(1):
33
511147de
JF
34-----------------------------------------------------------------------------
35$ git show | tig
36-----------------------------------------------------------------------------
d839253b 37
9783cb12 38[[cmd-options]]
d839253b
JF
39Git Command Options
40~~~~~~~~~~~~~~~~~~~
41
42All git command options specified on the command line will be passed to the
43given command and all will be shell quoted before they are passed to the
44shell.
45
46NOTE: If you specify options for the main view, you should not use the
47`--pretty` option as this option will be set automatically to the format
48expected by the main view.
49
50Example on how to open the log view and show both author and committer
51information:
52
511147de
JF
53-----------------------------------------------------------------------------
54$ tig log --pretty=fuller
55-----------------------------------------------------------------------------
d839253b
JF
56
57See the <<refspec, "Specifying revisions">> section below for an introduction
58to revision options supported by the git commands. For details on specific git
59command options, refer to the man page of the command in question.
60
9783cb12 61[[env-variables]]
d839253b
JF
62Environment Variables
63---------------------
64
65Several options related to the interface with git can be configured via
66environment options.
67
9783cb12 68[[repo-refs]]
d839253b
JF
69Repository References
70~~~~~~~~~~~~~~~~~~~~~
71
72Commits that are referenced by tags and branch heads will be marked by the
73reference name surrounded by '[' and ']':
74
511147de
JF
75-----------------------------------------------------------------------------
762006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1
77-----------------------------------------------------------------------------
d839253b
JF
78
79If you want to filter out certain directories under `.git/refs/`, say `tmp`
80you can do it by setting the following variable:
81
511147de
JF
82-----------------------------------------------------------------------------
83$ TIG_LS_REMOTE="git ls-remote . | sed /\/tmp\//d" tig
84-----------------------------------------------------------------------------
d839253b
JF
85
86Or set the variable permanently in your environment.
87
88TIG_LS_REMOTE::
89 Set command for retrieving all repository references. The command
90 should output data in the same format as git-ls-remote(1).
91
92[[history-commands]]
93History Commands
94~~~~~~~~~~~~~~~~
95
96It is possible to alter which commands are used for the different views. If
97for example you prefer commits in the main view to be sorted by date and only
98show 500 commits, use:
99
511147de
JF
100-----------------------------------------------------------------------------
101$ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig
102-----------------------------------------------------------------------------
d839253b
JF
103
104Or set the variable permanently in your environment.
105
106Notice, how `%s` is used to specify the commit reference. There can be a
107maximum of 5 `%s` ref specifications.
108
109TIG_DIFF_CMD::
110 The command used for the diff view. By default, git show is used
111 as a backend.
112
113TIG_LOG_CMD::
114 The command used for the log view. If you prefer to have both
115 author and committer shown in the log view be sure to pass
116 `--pretty=fuller` to git log.
117
118TIG_MAIN_CMD::
119 The command used for the main view. Note, you must always specify
120 the option: `--pretty=raw` since the main view parser expects to
121 read that format.
122
66c86725
JF
123[[tree-commands]]
124Tree Commands
125~~~~~~~~~~~~~
126
127TIG_TREE_CMD::
128 The command used for the tree view. Takes two arguments, the first
129 is the revision ID and the second is the path of the directory tree,
130 empty for the root directory. Defaults to "git ls-tree %s %s".
131
132TIG_BLOB_CMD::
133 The command used for the blob view. Takes one argument which is
134 the blob ID. Defaults to "git cat-file blob %s".
135
9783cb12 136[[viewer]]
d839253b
JF
137The Viewer
138----------
139
140The display consists of a status window on the last line of the screen and one
141or more views. The default is to only show one view at the time but it is
142possible to split both the main and log view to also show the commit diff.
143
144If you are in the log view and press 'Enter' when the current line is a commit
145line, such as:
146
511147de
JF
147-----------------------------------------------------------------------------
148commit 4d55caff4cc89335192f3e566004b4ceef572521
149-----------------------------------------------------------------------------
d839253b
JF
150
151You will split the view so that the log view is displayed in the top window
152and the diff view in the bottom window. You can switch between the two views
153by pressing 'Tab'. To maximize the log view again, simply press 'l'.
154
9783cb12 155[[commit-id]]
d839253b
JF
156Current Head and Commit ID
157~~~~~~~~~~~~~~~~~~~~~~~~~~
158
159The viewer keeps track of both what head and commit ID you are currently
f7ffec06 160viewing. The commit ID will follow the cursor line and change every time
d839253b
JF
161you highlight a different commit. Whenever you reopen the diff view it will be
162reloaded, if the commit ID changed.
163
164The head ID is used when opening the main and log view to indicate from what
165revision to show history.
166
9783cb12 167[[views]]
d839253b
JF
168Views
169~~~~~
170
511147de 171Various 'views' of a repository is presented. Each view is based on output
d839253b
JF
172from an external command, most often 'git log', 'git diff', or 'git show'.
173
174The main view::
175 Is the default view, and it shows a one line summary of each commit
176 in the chosen list of revisions. The summary includes commit date,
177 author, and the first line of the log message. Additionally, any
178 repository references, such as tags, will be shown.
179
180The log view::
181 Presents a more rich view of the revision log showing the whole log
182 message and the diffstat.
183
184The diff view::
185 Shows either the diff of the current working tree, that is, what
186 has changed since the last commit, or the commit diff complete
187 with log message, diffstat and diff.
188
3360f449
JF
189The tree view::
190 Lists directory trees associated with the current revision allowing
191 subdirectories to be descended or ascended and file blobs to be
192 viewed.
193
194The blob view::
195 Displays the file content or "blob" of data associated with a file
196 name.
197
d839253b
JF
198The pager view::
199 Is used for displaying both input from stdin and output from git
200 commands entered in the internal prompt.
201
202The help view::
24b5b3e0 203 Displays key binding quick reference.
d839253b 204
9783cb12 205[[title-window]]
d839253b
JF
206Title Windows
207~~~~~~~~~~~~~
208
209Each view has a title window which shows the name of the view, current commit
210ID if available, and where the view is positioned:
211
511147de
JF
212-----------------------------------------------------------------------------
213[main] c622eefaa485995320bc743431bae0d497b1d875 - commit 1 of 61 (1%)
214-----------------------------------------------------------------------------
d839253b
JF
215
216By default, the title of the current view is highlighted using bold font. For
217long loading views (taking over 3 seconds) the time since loading started will
218be appended:
219
511147de
JF
220-----------------------------------------------------------------------------
221[main] 77d9e40fbcea3238015aea403e06f61542df9a31 - commit 1 of 779 (0%) 5s
222-----------------------------------------------------------------------------
d839253b 223
9783cb12 224[[keys]]
669b0c34
JF
225Default Keybindings
226-------------------
d839253b
JF
227Below the default key bindings are shown.
228
9783cb12 229[[view-switching]]
d839253b
JF
230View Switching
231~~~~~~~~~~~~~~
669b0c34
JF
232
233`-------`--------------------------------------------------------------------
234Key Action
235-----------------------------------------------------------------------------
236m Switch to main view.
237d Switch to diff view.
238l Switch to log view.
239p Switch to pager view.
3360f449 240t Switch to (directory) tree view.
0001fc34 241f Switch to (file) blob view.
4af34daa 242h Show man page.
669b0c34 243-----------------------------------------------------------------------------
d839253b 244
9783cb12 245[[view-manipulation]]
d839253b
JF
246View Manipulation
247~~~~~~~~~~~~~~~~~
669b0c34
JF
248
249`-------`--------------------------------------------------------------------
250Key Action
251-----------------------------------------------------------------------------
252q Close view, if multiple views are open it will jump back to the \
253 previous view in the view stack. If it is the last open view it \
d839253b 254 will quit. Use 'Q' to quit all views at once.
669b0c34
JF
255Enter This key is "context sensitive" depending on what view you are \
256 currently in. When in log view on a commit line or in the main \
257 view, split the view and show the commit diff. In the diff view \
d839253b 258 pressing Enter will simply scroll the view one line down.
669b0c34
JF
259Tab Switch to next view.
260Up This key is "context sensitive" and will move the cursor one \
f7ffec06 261 line up. However, if you opened a diff view from the main view \
669b0c34
JF
262 (split- or full-screen) it will change the cursor to point to \
263 the previous commit in the main view and update the diff view \
d839253b 264 to display it.
669b0c34
JF
265Down Similar to 'Up' but will move down.
266-----------------------------------------------------------------------------
d839253b 267
9783cb12 268[[cursor-nav]]
d839253b
JF
269Cursor Navigation
270~~~~~~~~~~~~~~~~~
669b0c34
JF
271
272`-------`--------------------------------------------------------------------
273Key Action
274-----------------------------------------------------------------------------
275j Move cursor one line up.
276k Move cursor one line down.
03e8d891
JF
277PgUp,\
278-,a Move cursor one page up.
669b0c34
JF
279PgDown Space Move cursor one page down.
280Home Jump to first line.
281End Jump to last line.
282-----------------------------------------------------------------------------
d839253b 283
9783cb12 284[[view-scrolling]]
d839253b
JF
285Scrolling
286~~~~~~~~~
669b0c34
JF
287
288`-------`--------------------------------------------------------------------
289Key Action
290-----------------------------------------------------------------------------
291Insert Scroll view one line up.
292Delete Scroll view one line down.
293w Scroll view one page up.
294s Scroll view one page down.
295-----------------------------------------------------------------------------
d839253b 296
4af34daa
JF
297[[searching]]
298Searching
299~~~~~~~~~
300
301`-------`--------------------------------------------------------------------
302Key Action
303-----------------------------------------------------------------------------
304/ Search the view. Opens a prompt for entering search regex to use.
305? Search backwards in the view. Also prompts for regex.
306n Find next match for the current search regex.
307N Find previous match for the current search regex.
308-----------------------------------------------------------------------------
309
9783cb12 310[[misc-keys]]
d839253b
JF
311Misc
312~~~~
669b0c34
JF
313
314`-------`--------------------------------------------------------------------
315Key Action
316-----------------------------------------------------------------------------
317Q Quit.
318r Redraw screen.
319z Stop all background loading. This can be useful if you use \
320 tig in a repository with a long history without limiting \
d839253b 321 the revision log.
669b0c34 322v Show version.
904e68d8 323'.' Toggle line numbers on/off.
669b0c34
JF
324g Toggle revision graph visualization on/off.
325':' Open prompt. This allows you to specify what git command \
326 to run. Example `:log -p`
327-----------------------------------------------------------------------------
d839253b
JF
328
329[[refspec]]
330Revision Specification
331----------------------
332
333This section describes various ways to specify what revisions to display or
511147de 334otherwise limit the view to. Tig does not itself parse the described
f7ffec06 335revision options so refer to the relevant git man pages for further
d839253b
JF
336information. Relevant man pages besides git-log(1) are git-diff(1) and
337git-rev-list(1).
338
339You can tune the interaction with git by making use of the options explained
340in this section. For example, by configuring the environment variables
341described in the <<history-commands, "History commands">> section.
342
9783cb12 343[[path-limiting]]
d839253b
JF
344Limit by Path Name
345~~~~~~~~~~~~~~~~~~
346
347If you are interested only in those revisions that made changes to a specific
348file (or even several files) list the files like this:
349
511147de
JF
350-----------------------------------------------------------------------------
351$ tig log Makefile README
352-----------------------------------------------------------------------------
d839253b
JF
353
354To avoid ambiguity with repository references such as tag name, be sure to
355separate file names from other git options using "\--". So if you have a file
356named 'master' it will clash with the reference named 'master', and thus you
357will have to use:
358
511147de
JF
359-----------------------------------------------------------------------------
360$ tig log -- master
361-----------------------------------------------------------------------------
d839253b
JF
362
363NOTE: For the main view, avoiding ambiguity will in some cases require you to
511147de 364specify two "\--" options. The first will make tig stop option processing
d839253b
JF
365and the latter will be passed to git log.
366
9783cb12 367[[date-number-limiting]]
d839253b
JF
368Limit by Date or Number
369~~~~~~~~~~~~~~~~~~~~~~~
370
371To speed up interaction with git, you can limit the amount of commits to show
372both for the log and main view. Either limit by date using e.g.
373`--since=1.month` or limit by the number of commits using `-n400`.
374
375If you are only interested in changed that happened between two dates you can
376use:
377
511147de
JF
378-----------------------------------------------------------------------------
379$ tig -- --after="May 5th" --before="2006-05-16 15:44"
380-----------------------------------------------------------------------------
d839253b
JF
381
382NOTE: If you want to avoid having to quote dates containing spaces you can use
383"." instead, e.g. `--after=May.5th`.
384
9783cb12 385[[commit-range-limiting]]
d839253b
JF
386Limiting by Commit Ranges
387~~~~~~~~~~~~~~~~~~~~~~~~~
388
389Alternatively, commits can be limited to a specific range, such as "all
390commits between 'tag-1.0' and 'tag-2.0'". For example:
391
511147de
JF
392-----------------------------------------------------------------------------
393$ tig log tag-1.0..tag-2.0
394-----------------------------------------------------------------------------
d839253b
JF
395
396This way of commit limiting makes it trivial to only browse the commits which
397haven't been pushed to a remote branch. Assuming 'origin' is your upstream
398remote branch, using:
399
511147de
JF
400-----------------------------------------------------------------------------
401$ tig log origin..HEAD
402-----------------------------------------------------------------------------
d839253b
JF
403
404will list what will be pushed to the remote branch. Optionally, the ending
405'HEAD' can be left out since it is implied.
406
9783cb12 407[[reachability-limiting]]
d839253b
JF
408Limiting by Reachability
409~~~~~~~~~~~~~~~~~~~~~~~~
410
411Git interprets the range specifier "tag-1.0..tag-2.0" as "all commits
412reachable from 'tag-2.0' but not from 'tag-1.0'". Where reachability refers
413to what commits are ancestors (or part of the history) of the branch or tagged
414revision in question.
415
416If you prefer to specify which commit to preview in this way use the
417following:
418
511147de
JF
419-----------------------------------------------------------------------------
420$ tig log tag-2.0 ^tag-1.0
421-----------------------------------------------------------------------------
d839253b
JF
422
423You can think of '^' as a negation operator. Using this alternate syntax, it
424is possible to further prune commits by specifying multiple branch cut offs.
425
9783cb12 426[[refspec-combi]]
d839253b
JF
427Combining Revisions Specification
428~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
429
430Revisions options can to some degree be combined, which makes it possible to
431say "show at most 20 commits from within the last month that changed files
432under the Documentation/ directory."
433
511147de
JF
434-----------------------------------------------------------------------------
435$ tig -- --since=1.month -n20 -- Documentation/
436-----------------------------------------------------------------------------
d839253b 437
9783cb12 438[[refspec-all]]
d839253b
JF
439Examining All Repository References
440~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
441
442In some cases, it can be useful to query changes across all references in a
443repository. An example is to ask "did any line of development in this
444repository change a particular file within the last week". This can be
445accomplished using:
446
511147de
JF
447-----------------------------------------------------------------------------
448$ tig -- --all --since=1.week -- Makefile
449-----------------------------------------------------------------------------
d839253b
JF
450
451include::BUGS[]
452
9783cb12 453[[copy-right]]
d839253b
JF
454Copyright
455---------
456
457Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
458
459This program is free software; you can redistribute it and/or modify
460it under the terms of the GNU General Public License as published by
461the Free Software Foundation; either version 2 of the License, or
462(at your option) any later version.
463
9783cb12 464[[references]]
d839253b
JF
465References and Related Tools
466----------------------------
467
511147de
JF
468Manpages:
469
470 - gitlink:tig[1]
471 - gitlink:tigrc[5]
472
473Online resources:
474
d839253b
JF
475include::SITES[]
476
477Git porcelains:
478
479 - link:http://www.kernel.org/pub/software/scm/git/docs/[git],
480 - link:http://www.kernel.org/pub/software/scm/cogito/docs/[Cogito]
481
482Other git repository browsers:
483
484 - gitk(1)
485 - qgit(1)
486 - gitview(1)