From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 23:12:57 +0000 (-0700)
Subject: Merge branch 'jc/unresolve' into next
X-Git-Tag: v1.4.1-rc1~202
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60571f75ab81f9e1d5a5f351ac07f6d86a461230;p=git.git

Merge branch 'jc/unresolve' into next

* jc/unresolve:
  Add git-unresolve <paths>...
  get_tree_entry(): make it available from tree-walk
  sha1_name.c: no need to include diff.h; tree-walk.h will do.
  sha1_name.c: prepare to make get_tree_entry() reusable from others.
  pre-commit hook: complain about conflict markers.
  git-merge: a bit more readable user guidance.
  diff: move diff.c to diff-lib.c to make room.
  git log: don't do merge diffs by default
  Allow "git repack" users to specify repacking window/depth
---

60571f75ab81f9e1d5a5f351ac07f6d86a461230