← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/git-core/gutsy-updates

« back to all changes in this revision

Viewing changes to Documentation/config.txt

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-05-09 08:48:50 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20070509084850-p7irp0db9pxhoaa1
Tags: 1:1.5.1.4-1
http://bugs.debian.org/420671
* new upstream point release.
* debian/diff/pager-vs-less.diff: rename to
  0001-pager.c-fallback-to-pager-not-less-if-PAGER-is.diff; adapt.
* debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff:
  new: Optimize directory listing with pathspec limiter (closes: #420671).
* debian/git-daemon-run.postinst: restart git-daemon service if it was
  running.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Documentation/config.txt
490
490
merge.tool::
491
491
        Controls which merge resolution program is used by
492
492
        gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
493
 
        "meld", "xxdiff", "emerge", "vimdiff"
 
493
        "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
494
494
 
495
495
merge.verbosity::
496
496
        Controls the amount of output shown by the recursive merge