From: Catalin Marinas <catalin.marinas@gmail.com>
To: cel@citi.umich.edu
Cc: Blaisorblade <blaisorblade@yahoo.it>, git@vger.kernel.org
Subject: Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes
Date: Mon, 21 Nov 2005 21:32:40 +0000 [thread overview]
Message-ID: <b0943d9e0511211332h41e3850dt@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2005-11-21 21:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-13 19:42 [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes Paolo 'Blaisorblade' Giarrusso
2005-11-15 9:54 ` Catalin Marinas
2005-11-16 14:44 ` Blaisorblade
2005-11-17 22:10 ` Catalin Marinas
2005-11-17 22:50 ` Chuck Lever
2005-11-21 21:32 ` Catalin Marinas [this message]
2005-12-30 17:59 ` Blaisorblade
2006-01-07 11:23 ` Catalin Marinas
2006-01-08 1:50 ` Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0943d9e0511211332h41e3850dt@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=blaisorblade@yahoo.it \
--cc=cel@citi.umich.edu \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.