summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2008-09-13 18:11:00 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-15 21:21:59 -0700
commit90d1c08efcf9c688df207588d9b72178524a62b6 (patch)
tree5f3d6a5b92b414825f63c80821a5da891a88911a /diff.c
parentSync with 1.6.0.2 (diff)
downloadtgif-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 'diff.c')
0 files changed, 0 insertions, 0 deletions