Merge branch 'ak/typofix-2.46-maint'

Typofix.

* ak/typofix-2.46-maint:
  upload-pack: fix a typo
  sideband: fix a typo
  setup: fix a typo
  run-command: fix a typo
  revision: fix a typo
  refs: fix typos
  rebase: fix a typo
  read-cache-ll: fix a typo
  pretty: fix a typo
  object-file: fix a typo
  merge-ort: fix typos
  merge-ll: fix a typo
  http: fix a typo
  gpg-interface: fix a typo
  git-p4: fix typos
  git-instaweb: fix a typo
  fsmonitor-settings: fix a typo
  diffcore-rename: fix typos
  config.mak.dev: fix a typo

diff --cc config.mak.dev
Simple merge

diff --cc gpg-interface.c
Simple merge

diff --cc http.c
Simple merge

diff --cc merge-ll.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc object-file.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc refs.h
Simple merge

diff --cc setup.c
Simple merge

diff --cc sideband.c
Simple merge

diff --cc upload-pack.c
Simple merge