From: Andreas Schwab <schwab@linux-m68k•org>
To: "Dirk Süsserott" <newsletter@dirk•my1.cc>
Cc: git@vger•kernel.org
Subject: Re: modifying the commits before push
Date: Wed, 18 Jan 2012 23:01:39 +0100 [thread overview]
Message-ID: <m262g8r7p8.fsf@igel.home> (raw)
In-Reply-To: <87sjjc3cpj.fsf@gnu.org> (Sam Steingold's message of "Wed, 18 Jan 2012 16:47:20 -0500")
Sam Steingold <sds@gnu•org> writes:
> alas, I could not push because the remote tree was modified in the
> meantime, I pulled and now:
>
> # On branch master
> # Your branch is ahead of 'origin/master' by 23 commits.
What exactly did you do to get the additional 19 commits?
> is there a way for me to get back my original 4 patches, reset my tree
> (maybe by rm-rf+clone) and then re-apply them?
You can find them in the reflog (git log -g).
Andreas.
--
Andreas Schwab, schwab@linux-m68k•org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
prev parent reply other threads:[~2012-01-18 22:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-18 17:49 modifying the commits before push Sam Steingold
2012-01-18 20:18 ` Dirk Süsserott
2012-01-18 21:47 ` Sam Steingold
2012-01-18 22:01 ` Andreas Schwab [this message]
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=m262g8r7p8.fsf@igel.home \
--to=schwab@linux-m68k$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=newsletter@dirk$(echo .)my1.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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