| commit | 90d1c08efcf9c688df207588d9b72178524a62b6 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Sat, 13 Sep 2008 16:11:00 +0000 (13 18:11 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Sep 2008 04:21:59 +0000 (15 21:21 -0700) | ||
| tree | 5f3d6a5b92b414825f63c80821a5da891a88911a | treesnapshot (tar.gz zip) |
| parent | 1293c95241531f7f17ddb58739c5c42da46fa78c | commitdiff |
Documentation: new upstream rebase recovery section in git-rebase
Document how to recover if the upstream that you pull from has
rebased the branches you depend your work on. Hopefully this can also
serve as a warning to potential rebasers.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Document how to recover if the upstream that you pull from has
rebased the branches you depend your work on. Hopefully this can also
serve as a warning to potential rebasers.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory |