Junio C Hamano af02b6d34d Merge branch 'master' into next ...

* master: (23 commits)
  Git 1.7.1-rc2
  Documentation/remote-helpers: Fix typos and improve language
  Fixup: Second argument may be any arbitrary string
  Documentation/remote-helpers: Add invocation section
  Documentation/urls: Rewrite to accomodate <transport>::<address>
  Documentation/remote-helpers: Rewrite description
  Documentation: Describe other situations where -z affects git diff
  rebase-interactive: silence warning when no commits rewritten
  t3301: add tests to use --format="%N"
  documentation: clarify direction of core.autocrlf
  diff: use large integers for diffstat calculations
  gitk: Display dirty submodules correctly
  pretty: Initialize notes if %N is used
  gitk: Fix display of copyright symbol
  gitk: Add emacs editor variable block
  gitk: Avoid calling tk_setPalette on Windows
  gitk: Don't clobber "Remember this view" setting
  gitk: Add comments to explain encode_view_opts and decode_view_opts
  gitk: Use consistent font for all text input fields
  gitk: Set the font for all listbox widgets
  ...

Conflicts:
	builtin/log.c

2010-04-18 22:19:52 -07:00

103 KiB

Raw Blame History

View Raw