diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-04-12 15:41:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 15:41:19 -0700 |
commit | d6d96f835cace1c108100cf88e216a59debcb937 (patch) | |
tree | f5d347de6193849ad4cec2b52d35e225d9c1e9e9 /Documentation/gitk.txt | |
parent | eed81838f0d0e031702473e1d427d71055134edd (diff) | |
parent | e80950786c16e642be76976a8926b2846ba0aa4f (diff) | |
download | git-d6d96f835cace1c108100cf88e216a59debcb937.tar.gz git-d6d96f835cace1c108100cf88e216a59debcb937.tar.xz |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better
Diffstat (limited to 'Documentation/gitk.txt')
-rw-r--r-- | Documentation/gitk.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 29edafced..ed3ba83c5 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -74,6 +74,11 @@ gitk --max-count=100 --all \-- Makefile:: Show at most 100 changes made to the file 'Makefile'. Instead of only looking for changes in the current branch look in all branches. +Files +----- +Gitk creates the .gitk file in your $HOME directory to store preferences +such as display options, font, and colors. + See Also -------- 'qgit(1)':: |