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

* master:
  Document that git-am can read standard input.
  Make gitk save and restore the user set window position.
  t4016: test quoting funny pathnames in diff output
  diff.c: More logical file name quoting for renames in diffstat.
  diff.c: Properly quote file names in diff --summary output.
  diff.c: Reuse the pprint_rename function for diff --summary output.
  Make it easier to override path to asciidoc command
  Avoid ugly linewrap in git help
  Fixed some typos in git-repack docs
  git-svn: correctly handle boolean options via git-config
  Allow aliases to expand to shell commands
  Print a sane error message if an alias expands to an invalid git command
  diff_flush_name(): take struct diff_options parameter.

2007-02-11 14:08:27 -08:00

71 KiB

Raw Blame History

View Raw