From: Junio C Hamano <junkio@cox.net>
Date: Thu, 20 Apr 2006 19:45:16 +0000 (-0700)
Subject: Merge branch 'jc/fmt-patch' into next
X-Git-Tag: v1.4.1-rc1~196
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3155ef8a4a88dca15fb49855b28cac80666efe5c?hp=-c

Merge branch 'jc/fmt-patch' into next

* jc/fmt-patch:
rename internal format-patch wip
---

3155ef8a4a88dca15fb49855b28cac80666efe5c
diff --combined git.c
index 447d86cd57,d5aa41df92..c20ae45bb7
--- a/git.c
+++ b/git.c
@@@ -368,6 -368,8 +368,6 @@@ static int cmd_log(int argc, const cha
  	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);
  }
  
@@@ -383,7 -385,7 +383,7 @@@ static void handle_internal_command(in
  		{ "log", cmd_log },
  		{ "whatchanged", cmd_wc },
  		{ "show", cmd_show },
- 		{ "format-patch", cmd_format_patch },
+ 		{ "fmt-patch", cmd_format_patch },
  	};
  	int i;