git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: [StGit PATCH 5/6] Refresh the main stg man page
Date: Mon, 6 Oct 2008 22:14:05 +0100	[thread overview]
Message-ID: <b0943d9e0810061414ja87488k6aef65fec0856144@mail.gmail.com> (raw)
In-Reply-To: <20081005160157.19886.7137.stgit@yoghurt>

2008/10/5 Karl Hasselström <kha@treskal.com>:
> Update the text to reflect what's happened in StGit in the last few
> releases. Also, consistently capitalize the names "Git" and "StGit".

I need to change the websites as well (BTW, I gave you admin rights on
the gna.org project page).

> --- a/Documentation/stg.txt
> +++ b/Documentation/stg.txt
[...]
> +  * After making changes to the worktree, you can incorporate the
> +    changes into an existing patch; this is called 'refreshing'. You
> +    may refresh any patch, not just the topmost one.

I wouldn't advertise the refreshing of "any" patch as it doesn't
always work (it actually fails in a lot of cases). Or at least we
could mention that there are some restrictions.

> +  * You can easily 'rebase' your patch stack on top of any other Git
> +    branch.

It might be better with something like "on top of a different Git
commit". The first thought when reading the above is that you can move
the patch stack to a different Git branch easily, which is not the
case (you need to cherry-pick the patches).

> +  * The patch stack is just some extra metadata attached to regular
> +    Git commits, so you can continue to use Git tools along with
> +    StGit.

Again, this is with some restrictions (or there aren't any with the
new infrastructure?).

> +  Tracking changes from a remote branch, while maintaining local
> +  modifications against that branch, possibly with the intent of
> +  sending some patches upstream. You can modify your patch stack as
> +  much as you want, and when your patches are finally accepted
> +  upstream, the permanent recorded Git history will contain just the
> +  final sequence of patches, and not the messy sequence of edits that
> +  produced them.

Maybe we could mention that the local history is also clean, not only
the upstream tree (though you mention it later in a different hunk).

-- 
Catalin

  reply	other threads:[~2008-10-06 21:15 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-05 16:01 [StGit PATCH 0/6] Documentation updates Karl Hasselström
2008-10-05 16:01 ` [StGit PATCH 1/6] Remove unused variable Karl Hasselström
2008-10-05 16:01 ` [StGit PATCH 2/6] Remove TODO items that have already been addressed Karl Hasselström
2008-10-06 20:43   ` Catalin Marinas
2008-10-07  7:05     ` Karl Hasselström
2008-10-05 16:01 ` [StGit PATCH 3/6] We're half-way there with the separate indexes Karl Hasselström
2008-10-05 16:01 ` [StGit PATCH 4/6] Add 1.0 TODO items from recent discussion by private mail Karl Hasselström
2008-10-06 20:50   ` Catalin Marinas
2008-10-07  7:07     ` Karl Hasselström
2008-10-05 16:01 ` [StGit PATCH 5/6] Refresh the main stg man page Karl Hasselström
2008-10-06 21:14   ` Catalin Marinas [this message]
2008-10-06 21:30     ` Samuel Tardieu
2008-10-07  7:40     ` Karl Hasselström
2008-10-06 21:15   ` Catalin Marinas
2008-10-07  7:32     ` Karl Hasselström
2008-10-05 16:02 ` [StGit PATCH 6/6] Refresh and expand the tutorial (not finished) Karl Hasselström
2008-10-06 21:25   ` Catalin Marinas
2008-10-07  7:12     ` Karl Hasselström
2008-10-08  9:24       ` Karl Hasselström

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=b0943d9e0810061414ja87488k6aef65fec0856144@mail.gmail.com \
    --to=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kha@treskal.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).