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

1 files changed, 0 insertions, 2 deletions

diff --git a/git.c b/git.c
index 0c40773a87..447d86cd57 100644
--- a/git.c
+++ b/git.c
@@ -368,8 +368,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
 	init_revisions(&rev);
 	rev.always_show_header = 1;
 	rev.diffopt.recursive = 1;
-	rev.combine_merges = 1;
-	rev.ignore_merges = 0;
 	return cmd_log_wc(argc, argv, envp, &rev);
 }