Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
Revision 897d28bcc23878b5d98b46f3903e3d2a302d8a01 authored by Junio C Hamano on 06 February 2021, 00:31:23 UTC, committed by Junio C Hamano on 06 February 2021, 00:31:23 UTC 
Merge branch 'ds/for-each-repo-noopfix' into maint
 
"git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.

* ds/for-each-repo-noopfix:
  for-each-repo: do nothing on empty config
2 parent s 4fc7b22 + 6c62f01
Raw File
Tip revision: 897d28bcc23878b5d98b46f3903e3d2a302d8a01 authored by Junio C Hamano on 06 February 2021, 00:31:23 UTC
Merge branch 'ds/for-each-repo-noopfix' into maint
Tip revision: 897d28b
merge-ort-wrappers.h 
#ifndef MERGE_ORT_WRAPPERS_H
#define MERGE_ORT_WRAPPERS_H

#include "merge-recursive.h"

/*
 * rename-detecting three-way merge, no recursion.
 * Wrapper mimicking the old merge_trees() function.
 */
int merge_ort_nonrecursive(struct merge_options *opt,
			   struct tree *head,
			   struct tree *merge,
			   struct tree *common);

/*
 * rename-detecting three-way merge with recursive ancestor consolidation.
 * Wrapper mimicking the old merge_recursive() function.
 */
int merge_ort_recursive(struct merge_options *opt,
			struct commit *h1,
			struct commit *h2,
			struct commit_list *ancestors,
			struct commit **result);

#endif
back to top