git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Alter git-rebase command line options.

From
Jakub Narebski <jnareb@gmail.com>
Date
Apr 26, 2006, 12:30 UTC
Message-ID
<e2np4p$b9a$1@sea.gmane.org>
In-Reply-To
<BAYC1-PASMTP0659C709B7FFCB63182FE1AEBC0@CEZ.ICE>
sean wrote:
Show 11 quoted lines
>   git rebase [--branch <branch>] <newbase>
>   git rebase --continue
>   git rebase --abort
> 
> Add "--continue" to restart the rebase process after
> manually resolving conflicts.  The user is warned if
> there are still differences between the index and the
> working files.
> 
> Add "--abort" to restore the original branch, and
> remove the .dotest working files.
Very nice.
Show 18 quoted lines
>  SYNOPSIS
>  --------
> -'git-rebase' [--onto <newbase>] <upstream> [<branch>]
> +'git-rebase' [--branch <branch>] <newbase>
> +
> +'git-rebase' --continue
> +
> +'git-rebase' --abort
>  
>  DESCRIPTION
>  -----------
> -git-rebase applies to <upstream> (or optionally to <newbase>) commits
> -from <branch> that do not appear in <upstream>. When <branch> is not
> -specified it defaults to the current branch (HEAD).
> +git-rebase replaces <branch> with a new branch of the same name having
> +a HEAD of <newbase>.  It then attempts to make a new commit for each
> +commit from the original <branch> that does not yet exist in this new
> +<branch>.

What about 'git-rebase --onto <newbase> <upstream> <branch>' three options version?

-- 
Jakub Narebski
Warsaw, Poland
Previous: seanNext: sean
Message 2 of 6 in “Alter git-rebase command line options.”
  1. Alter git-rebase command line options.sean, Apr 26, 2006
  2. Jakub NarebskiApr 26, 2006
  3. seanApr 26, 2006
  4. Add --continue and --abort options to git-rebase.sean, Apr 26, 2006
  5. Junio C HamanoApr 26, 2006
  6. seanApr 27, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.