summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@inf.ethz.ch>2013-10-20 18:57:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-22 11:23:31 -0700
commit744db23c2d4399ff345a0ef6f2407c9a494d91dd (patch)
tree3c1ffee10f5abce6aa2a3109aa95b5e2170e0c78 /t/t3310-notes-merge-manual-resolve.sh
parentgit-merge: document the -S option (diff)
downloadtgif-744db23c2d4399ff345a0ef6f2407c9a494d91dd.tar.xz
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only minor changes, and no changes to the set of options documented, since a2df1fb (Documentation: New GUI configuration and command-line options., 2008-11-13). In the meantime, the set of rev-list options has been expanded several times by options that are useful in gitk, e.g., --ancestry-path and the optional globbing for --branches, --tags and --remotes. Restructure and expand the manpage. List more options that the author perceives as useful, while remaining somewhat terse. Ideally the user should not have to look up any of the references, but we dispense with precise explanations in some places and refer to git-log(1) instead. Note that the options that have an easy GUI equivalent (e.g., --word-diff, -S, --grep) are deliberately not listed even in the cases where they simply fill in the GUI fields. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions