Junio C Hamano fddf1d2f0c Merge branch 'sb/merge-friendly' into next ...

* sb/merge-friendly:
  Display 'theirs' branch name when possible in merge.
  Use extended SHA1 syntax in merge-recursive conflicts.
  gitweb: Allow search to be disabled from the config file.
  gitweb: Require a minimum of two character for the search text.
  gitweb: Use rev-list pattern search options.
  checkout: make the message about the need for a new branch a bit clearer
  gitweb: optimize git_summary.
  gitweb: optimize git_shortlog_body.
  gitweb: optimize git_get_last_activity.
  gitweb: Add missing show '...' links change.
  Make git-show-branch options similar to git-branch.
  Keep "git --git-dir" from causing a bus error.
  git-svn: enable common fetch/commit options for dcommit
  vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
  Remove NO_ACCURATE_DIFF options from build systems
  git-tag: lose exit after die
  Really fix headers for __FreeBSD__
  Do not support "partial URL shorthand" anymore.
  default pull: forget about "newbie protection" for now.
  merge and reset: adjust for "reset --hard" messages

2006-12-23 01:30:04 -08:00

9.5 KiB

Raw Blame History

View Raw