undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to improve git-rebase lead-in description.

Browse Source 
It was mentioned on #git this morning that the lead-in description
of git-rebase is very confusing.  Too many branch this and branch
that in a very short run of text.

This new description attempts to walk the user through the command
syntax, while also describing exactly what git-rebase is doing to
their repository.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2007-02-17 04:31:50 -05:00 committed by Junio C Hamano
parent 185c975faa
commit 5ca2db5376
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Documentation/git-rebase.txt
View File

@ -13,11 +13,20 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
git-rebase replaces <branch> with a new branch of the same name. When If <branch> is specified, git-rebase will perform an automatic
the --onto option is provided the new branch starts out with a HEAD equal `git checkout <branch>` before doing anything else. Otherwise
to <newbase>, otherwise it is equal to <upstream>. It then attempts to it remains on the current branch.
create a new commit for each commit from the original <branch> that does
not exist in the <upstream> branch. All changes made by commits in the current branch but that are not
in <upstream> are saved to a temporary area. This is the same set
of commits that would be shown by `git log <upstream>..HEAD`.
The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
`git reset --hard <upstream>` (or <newbase>).
The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order.
It is possible that a merge failure will prevent this process from being It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure completely automatic. You will have to resolve any such merge failure
@ -26,9 +35,6 @@ that caused the merge failure with `git rebase --skip`. To restore the
original <branch> and remove the .dotest working files, use the command original <branch> and remove the .dotest working files, use the command
`git rebase --abort` instead. `git rebase --abort` instead.
Note that if <branch> is not specified on the command line, the currently
checked out branch is used.
Assume the following history exists and the current branch is "topic": Assume the following history exists and the current branch is "topic":
------------ ------------