Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (65 commits)
  GIT 1.5.5
  git-svn: fix following renamed paths when tracking a single path
  Add prefix oriented completions for diff and format-patch commands.
  test suite: remove useless TERM cruft in "t7005-editor.sh"
  Add interactive option in rebase command completion list.
  Fix "git apply" to correctly enforce "match at the beginning"
  Add description of OFS_DELTA to the pack format description
  gitk: Fix changing colors through Edit->Preferences
  git-pack-objects.txt: Make wording slightly less ambiguous
  git-fetch: Don't trigger a bus error when given the refspec "tag"
  Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
  git-gui: use +/- instead of ]/[ to show more/less context in diff
  git-gui: Update french translation
  git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
  GIT 1.5.5-rc3
  Describe the bug in handling filenames with funny characters in 'git add -i'
  t7004-tag: Skip more tests if gpg is not available.
  verify-tag: Clean up the temporary file if gpg cannot be started.
  help: Add a missing OPT_END().
  Accept git aliases outside a git repository
  ...