]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-rebase(1) |
2 | ============= | |
7fc9d69f JH |
3 | |
4 | NAME | |
5 | ---- | |
7bd7f280 | 6 | git-rebase - Rebase local commits to new upstream head |
7fc9d69f JH |
7 | |
8 | SYNOPSIS | |
9 | -------- | |
69a60af5 | 10 | 'git-rebase' [--onto <newbase>] <upstream> [<branch>] |
7fc9d69f JH |
11 | |
12 | DESCRIPTION | |
13 | ----------- | |
69a60af5 CW |
14 | git-rebase applies to <upstream> (or optionally to <newbase>) commits |
15 | from <branch> that do not appear in <upstream>. When <branch> is not | |
16 | specified it defaults to the current branch (HEAD). | |
17 | ||
18 | When git-rebase is complete, <branch> will be updated to point to the | |
19 | newly created line of commit objects, so the previous line will not be | |
20 | accessible unless there are other references to it already. | |
21 | ||
22 | Assume the following history exists and the current branch is "topic": | |
23 | ||
24 | A---B---C topic | |
25 | / | |
26 | D---E---F---G master | |
27 | ||
228382ae | 28 | From this point, the result of either of the following commands: |
69a60af5 CW |
29 | |
30 | git-rebase master | |
31 | git-rebase master topic | |
32 | ||
33 | would be: | |
34 | ||
35 | A'--B'--C' topic | |
36 | / | |
37 | D---E---F---G master | |
38 | ||
228382ae | 39 | While, starting from the same point, the result of either of the following |
69a60af5 CW |
40 | commands: |
41 | ||
42 | git-rebase --onto master~1 master | |
43 | git-rebase --onto master~1 master topic | |
44 | ||
45 | would be: | |
46 | ||
47 | A'--B'--C' topic | |
48 | / | |
49 | D---E---F---G master | |
7fc9d69f JH |
50 | |
51 | OPTIONS | |
52 | ------- | |
69a60af5 CW |
53 | <newbase>:: |
54 | Starting point at which to create the new commits. If the | |
55 | --onto option is not specified, the starting point is | |
56 | <upstream>. | |
57 | ||
52a22d1e LAS |
58 | <upstream>:: |
59 | Upstream branch to compare against. | |
7fc9d69f | 60 | |
228382ae | 61 | <branch>:: |
52a22d1e | 62 | Working branch; defaults to HEAD. |
7fc9d69f JH |
63 | |
64 | Author | |
65 | ------ | |
66 | Written by Junio C Hamano <junkio@cox.net> | |
67 | ||
68 | Documentation | |
69 | -------------- | |
70 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
71 | ||
72 | GIT | |
73 | --- | |
a7154e91 | 74 | Part of the gitlink:git[7] suite |
7fc9d69f | 75 |