public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@gmail•com>
To: Pavel Roskin <proski@gnu•org>
Cc: "J. Bruce Fields" <bfields@fieldses•org>,
	Yann Dirson <ydirson@altern•org>, git <git@vger•kernel.org>,
	Charles Lever <cel@citi•umich.edu>
Subject: Re: StGIT: "stg new" vs "stg new --force"
Date: Tue, 24 Jan 2006 21:23:05 +0000	[thread overview]
Message-ID: <b0943d9e0601241323u3cf6fbfbk@mail.gmail.com> (raw)
In-Reply-To: <1138126671.24415.28.camel@dv>

On 24/01/06, Pavel Roskin <proski@gnu•org> wrote:
> Seriously, it would be nice to have an editor that would allow to edit
> the patch and see the resulting file and vice versa.  Maybe emacs could
> be hacked to do it.

I think emacs has some basic support via ediff-merge or smerge but
it's difficult to integrate it with StGIT. Refreshing a patch with
StGIT means updating the GIT index files with the latest changes in
the working directory, save the index and create a commit object
pointing to it.

--
Catalin

  reply	other threads:[~2006-01-24 21:23 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-13  9:24 StGIT: "stg new" vs "stg new --force" Pavel Roskin
2006-01-13  9:34 ` Karl Hasselström
2006-01-16  8:18 ` Catalin Marinas
2006-01-17 17:01   ` Pavel Roskin
2006-01-17 21:57     ` Yann Dirson
2006-01-17 23:16       ` Pavel Roskin
2006-01-18 19:37         ` Yann Dirson
2006-01-19  0:49           ` Pavel Roskin
2006-01-19 21:38             ` Yann Dirson
2006-01-20  6:23               ` Pavel Roskin
2006-01-20 18:22                 ` J. Bruce Fields
2006-01-24  5:30                   ` Pavel Roskin
2006-01-24 17:54                     ` J. Bruce Fields
2006-01-24 18:17                       ` Pavel Roskin
2006-01-24 21:23                         ` Catalin Marinas [this message]
2006-01-21 18:24         ` Catalin Marinas
2006-01-22  5:05           ` Pavel Roskin
2006-01-21 18:20       ` Catalin Marinas
2006-01-21 18:31     ` Catalin Marinas

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=b0943d9e0601241323u3cf6fbfbk@mail.gmail.com \
    --to=catalin.marinas@gmail$(echo .)com \
    --cc=bfields@fieldses$(echo .)org \
    --cc=cel@citi$(echo .)umich.edu \
    --cc=git@vger$(echo .)kernel.org \
    --cc=proski@gnu$(echo .)org \
    --cc=ydirson@altern$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox