Merge branch 'rs/merge-compact-summary'
Hotfix. * rs/merge-compact-summary: merge: don't document non-existing --compact-summary argumentmaint
						commit
						22dd6abc32
					
				|  | @ -264,7 +264,7 @@ static struct option builtin_merge_options[] = { | |||
| 	OPT_BOOL(0, "stat", &show_diffstat, | ||||
| 		N_("show a diffstat at the end of the merge")), | ||||
| 	OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), | ||||
| 	OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, N_("compact-summary"), | ||||
| 	OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, NULL, | ||||
| 		       N_("show a compact-summary at the end of the merge"), | ||||
| 		       PARSE_OPT_NOARG, | ||||
| 		       option_parse_compact_summary), | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano