From: bill lam <cbill.lam@gmail.com>
To: git <git@vger.kernel.org>
Subject: rebase hint unmerged file removed
Date: Mon, 24 Aug 2009 22:05:49 +0800 [thread overview]
Message-ID: <20090824140549.GA3973@debian.b2j> (raw)
Sometimes during rebase -i, it stopped with an unmerged file but that
file did not have any sections of conflict marked. ls-files showed it
had :1: and :2: but no :3: I suspected that file was git-rm in that
commit. Will it be possible for git status or rebase to give hint
that unmerged file was actually removed?
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
next reply other threads:[~2009-08-24 14:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-24 14:05 bill lam [this message]
2009-08-24 14:36 ` rebase hint unmerged file removed Jeff King
2009-08-25 4:42 ` bill lam
2009-08-24 14:42 ` Johannes Sixt
2009-08-25 7:35 ` Johannes Sixt
2009-08-25 8:11 ` Miklos Vajna
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=20090824140549.GA3973@debian.b2j \
--to=cbill.lam@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.