Skip to main content

Browse the archive

Staging
v0.5.0
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC 
Merge branch 'js/branch-track-inherit'
 
"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
2 parent s 50b2d72 + 6327f0e
Raw File
Tip revision: 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC
Merge branch 'js/branch-track-inherit'
Tip revision: 297ca89
range-diff.h 
#ifndef RANGE_DIFF_H
#define RANGE_DIFF_H

#include "diff.h"
#include "strvec.h"

#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60

struct range_diff_options {
	int creation_factor;
	unsigned dual_color:1;
	unsigned left_only:1, right_only:1;
	const struct diff_options *diffopt; /* may be NULL */
	const struct strvec *other_arg; /* may be NULL */
};

/*
 * Compare series of commits in `range1` and `range2`, and emit to the
 * standard output.
 */
int show_range_diff(const char *range1, const char *range2,
		    struct range_diff_options *opts);

/*
 * Determine whether the given argument is usable as a range argument of `git
 * range-diff`, e.g. A..B.
 */
int is_range_diff_range(const char *arg);

#endif
back to top