From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Mon, 21 Nov 2005 21:32:40 GMT
Subject: Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes
Message-ID: <b0943d9e0511211332h41e3850dt@mail.gmail.com>
In-Reply-To: <437D0949.3060505@citi.umich.edu>

On 17/11/05, Chuck Lever <cel@citi.umich.edu> wrote:
> i use "original" "patch" and "older" (set up in .stgitrc) because i
> found the default labels to be confusing.
>
> but "original" "patch" and "upstream" make sense to me.

These names would need to have a meaning for the result of the 'fold
--threeway' and 'pick' commands. 'patch' and 'original' are ok but
'upstream' might not make sense since for these commands it can
represent the top of an existing patch.

--
Catalin