diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 22:58:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 22:58:13 (GMT) |
| commit | 6904f9aa5ba7666cdb5390733225e123fe25526b (patch) | |
| tree | 7867aa393189903c8075c16abc35163f6de07243 /Documentation | |
| parent | 604ada435b78a473baa6962a90def78ccb186c58 (diff) | |
| parent | 0ea7d5b6f8e258fdec067edf1b136ed87c5670e5 (diff) | |
| download | git-6904f9aa5ba7666cdb5390733225e123fe25526b.zip git-6904f9aa5ba7666cdb5390733225e123fe25526b.tar.gz git-6904f9aa5ba7666cdb5390733225e123fe25526b.tar.bz2 | |
Merge branch 'zk/difftool-counts'
Show the total number of paths and the number of paths shown so far
when "git difftool" prompts to launch an external diff tool, which
would give users some sense of progress.
* zk/difftool-counts:
diff.c: fix some recent whitespace style violations
difftool: display the number of files in the diff queue in the prompt
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index cc0e5e2..aec3726 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -807,6 +807,15 @@ temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits. + For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, <path>. ++ +For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables, +'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set. + +'GIT_DIFF_PATH_COUNTER':: + A 1-based counter incremented by one for every path. + +'GIT_DIFF_PATH_TOTAL':: + The total number of paths. other ~~~~~ |