Skip to content
Snippets Groups Projects
Commit b5c0f6a11430 authored by Martin Geisler's avatar Martin Geisler
Browse files

rebase: stress that only local changesets should be rebased

parent db2897926d14
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,6 @@
Rebase uses repeated merging to graft changesets from one part of
history (the source) onto another (the destination). This can be
useful for linearizing local changes relative to a master
useful for linearizing *local* changes relative to a master
development tree.
......@@ -33,5 +33,10 @@
development tree.
You should not rebase changesets that have already been shared
with others. Doing so will force everybody else to perform the
same rebase or they will end up with duplicated changesets after
pulling in your rebased changesets.
If you don't specify a destination changeset (``-d/--dest``),
rebase uses the tipmost head of the current named branch as the
destination. (The destination changeset is not modified by
......
......@@ -9,7 +9,12 @@
Rebase uses repeated merging to graft changesets from one part of history
(the source) onto another (the destination). This can be useful for
linearizing local changes relative to a master development tree.
linearizing *local* changes relative to a master development tree.
You should not rebase changesets that have already been shared with
others. Doing so will force everybody else to perform the same rebase or
they will end up with duplicated changesets after pulling in your rebased
changesets.
If you don't specify a destination changeset ("-d/--dest"), rebase uses
the tipmost head of the current named branch as the destination. (The
......@@ -68,7 +73,12 @@
Rebase uses repeated merging to graft changesets from one part of history
(the source) onto another (the destination). This can be useful for
linearizing local changes relative to a master development tree.
linearizing *local* changes relative to a master development tree.
You should not rebase changesets that have already been shared with
others. Doing so will force everybody else to perform the same rebase or
they will end up with duplicated changesets after pulling in your rebased
changesets.
If you don't specify a destination changeset ("-d/--dest"), rebase uses
the tipmost head of the current named branch as the destination. (The
......@@ -127,7 +137,12 @@
Rebase uses repeated merging to graft changesets from one part of history
(the source) onto another (the destination). This can be useful for
linearizing local changes relative to a master development tree.
linearizing *local* changes relative to a master development tree.
You should not rebase changesets that have already been shared with
others. Doing so will force everybody else to perform the same rebase or
they will end up with duplicated changesets after pulling in your rebased
changesets.
If you don't specify a destination changeset ("-d/--dest"), rebase uses
the tipmost head of the current named branch as the destination. (The
......@@ -186,7 +201,12 @@
Rebase uses repeated merging to graft changesets from one part of history
(the source) onto another (the destination). This can be useful for
linearizing local changes relative to a master development tree.
linearizing *local* changes relative to a master development tree.
You should not rebase changesets that have already been shared with
others. Doing so will force everybody else to perform the same rebase or
they will end up with duplicated changesets after pulling in your rebased
changesets.
If you don't specify a destination changeset ("-d/--dest"), rebase uses
the tipmost head of the current named branch as the destination. (The
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment