Re: [PATCH] branch: optionally setup branch.*.merge from upstream local branches

From

Alex Riesen <raa.lkml@gmail.com>

Date

Feb 19, 2008, 07:44 UTC

Message-ID

<20080219074423.GA3982@steel.home>

In-Reply-To

<1203386832-43969-1-git-send-email-jaysoffian@gmail.com>

Jay Soffian, Tue, Feb 19, 2008 03:07:12 +0100:

> diff --git a/cache.h b/cache.h
> index 2b59c44..3c17e2c 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -393,6 +393,14 @@ enum safe_crlf {
>  
>  extern enum safe_crlf safe_crlf;
>  
> +enum branch_track {
> +	BRANCH_TRACK_NEVER = 0,

enums start at 0 anyway, don't they?

> +	BRANCH_TRACK_REMOTE,
> +	BRANCH_TRACK_ALWAYS,
> +};