From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Cc: Catalin Marinas <catalin.marinas@gmail.com>
Subject: StGIT loses Git commit using "stg repair"; I miss "stg assimilate"
Date: Mon, 7 Jan 2008 23:45:18 +0100 [thread overview]
Message-ID: <200801072345.21585.jnareb@gmail.com> (raw)
I have StGIT branch with no patches applied: all patches are on stack.
I have accidentally added git commit on top of StGIT branch head.
I tried to use "stg assimilate" to turn this commit into StGIT commit,
applied, but new version of StGIT has only "stg repair". And the
sequence
# stg repair
# stg rebase origin
made me lose this git commit (well, up to reflog of course). This should
not happen! Why assimilate got removed?
4206:[gitweb/web@git]# stg --version
Stacked GIT 0.14.1
git version 1.5.3.7
Python version 2.4.3 (#1, Jun 13 2006, 16:41:18)
[GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]
--
Jakub Narebski
Poland
next reply other threads:[~2008-01-07 22:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-07 22:45 Jakub Narebski [this message]
2008-01-07 23:11 ` StGIT loses Git commit using "stg repair"; I miss "stg assimilate" David Kågedal
2008-01-07 23:15 ` David Kågedal
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=200801072345.21585.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=catalin.marinas@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox