Merge branch 'maint'

* maint:
  Documentation: don't reference non-existent 'git-cvsapplycommit'
  user-manual: stop deprecating the manual
  user-manual: miscellaneous editing
  user-manual: fix .gitconfig editing examples
  user-manual: clean up fast-forward and dangling-objects sections
  user-manual: add section ID's
  user-manual: more discussion of detached heads, fix typos
  git-gui: Allow spaces in path to 'wish'
  gitk: Allow user to choose whether to see the diff, old file, or new file
This commit is contained in:
Junio C Hamano
2007-05-07 14:46:48 -07:00
5 changed files with 205 additions and 81 deletions

View File

@ -4137,7 +4137,7 @@ proc do_gitk {revs} {
# -- Always start gitk through whatever we were loaded with. This
# lets us bypass using shell process on Windows systems.
#
set cmd [info nameofexecutable]
set cmd [list [info nameofexecutable]]
lappend cmd [gitexec gitk]
if {$revs ne {}} {
append cmd { }