diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2008-09-13 18:11:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-15 21:21:59 -0700 |
| commit | 90d1c08efcf9c688df207588d9b72178524a62b6 (patch) | |
| tree | 5f3d6a5b92b414825f63c80821a5da891a88911a /Documentation/technical/api-lockfile.txt | |
| parent | Sync with 1.6.0.2 (diff) | |
| download | tgif-90d1c08efcf9c688df207588d9b72178524a62b6.tar.xz | |
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>
Diffstat (limited to 'Documentation/technical/api-lockfile.txt')
0 files changed, 0 insertions, 0 deletions