Junio C Hamano 16007f3916 Merge branch 'maint' ...

* maint:
  merge-file: handle empty files gracefully
  merge-recursive: handle file mode changes
  Minor wording changes in the keyboard descriptions in git-add --interactive.
  git fetch: Take '-n' to mean '--no-tags'
  quiltimport: fix misquoting of parsed -p<num> parameter
  git-quiltimport: better parser to grok "enhanced" series files.

2008-03-14 00:16:42 -07:00

5.3 KiB

Raw Blame History

View Raw