Junio C Hamano 70d5d9caaf Merge branch 'master' into next ...

* master: (22 commits)
  pager: Work around window resizing bug in 'less'
  Teach git-remote add to fetch and track
  blame: document --contents option
  Use pretend_sha1_file() in git-blame and git-merge-recursive.
  Add pretend_sha1_file() interface.
  git-blame: no rev means start from the working tree file.
  git-blame: an Emacs minor mode to view file with git-blame output.
  Allow forcing of a parent commit, even if the parent is not a direct one.
  bisect: it needs to be done in a working tree.
  Commands requiring a work tree must not run in GIT_DIR
  Add hg-to-git conversion utility.
  blameview: Support browsable functionality to blameview.
  gitweb: Convert project name to UTF-8
  bash: Support git-bisect and its subcommands.
  bash: Support --add completion to git-config.
  bash: Hide git-resolve, its deprecated.
  bash: Offer --prune completion for git-gc.
  bash: Hide diff-stages from completion.
  bash: Support completion on git-cherry.
  Show an example of deleting commits with git-rebase.
  ...

2007-02-05 15:47:13 -08:00

10 KiB

Raw Blame History

View Raw