From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Subject: Re: 'git rebase' silently drops changes?
Date: Sat, 07 Feb 2015 22:32:05 +0100 [thread overview]
Message-ID: <54D68455.5070305@gmail.com> (raw)
In-Reply-To: <87386ispb3.fsf@osv.gnss.ru>
On 06.02.2015 22:28, Sergey Organov wrote:
> # Now rebase my work.
> git rebase -f HEAD~1
>
> # What? Where is my "Precious" change in "a"???
> cat a
> </SCRIPT>
>
> I.e., the modification marked [!] was silently lost during rebase!
Just a wild guess: Maybe because you omitted "-p" / "--preserve-merges"
from "git rebase"?
--
Sebastian Schuberth
next prev parent reply other threads:[~2015-02-07 21:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-06 21:28 'git rebase' silently drops changes? Sergey Organov
2015-02-07 21:32 ` Sebastian Schuberth [this message]
2015-02-08 13:49 ` Johannes Sixt
2015-02-09 12:53 ` Sergey Organov
2015-02-09 19:03 ` Johannes Sixt
2015-02-10 11:46 ` Sergey Organov
2015-02-10 18:26 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54D68455.5070305@gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.