From: Thien-Thi Nguyen <ttn@gnuvola.org>
To: ludo@gnu.org (Ludovic Courtès)
Cc: guile-devel@gnu.org
Subject: Re: git push weird?
Date: Tue, 15 Jun 2010 21:39:11 +0200 [thread overview]
Message-ID: <871vc8nl0g.fsf@ambire.localdomain> (raw)
In-Reply-To: <87sk4onmzw.fsf@gnu.org> ("Ludovic Courtès"'s message of "Tue, 15 Jun 2010 20:56:19 +0200")
() ludo@gnu.org (Ludovic Courtès)
() Tue, 15 Jun 2010 20:56:19 +0200
These are “merge commits”. Please avoid pushing any merge commits as
they make the history non-linear for no reason in such situations.
See ‘git rebase’ and the like for how to avoid it.
OK.
Besides, did you mean to push to ‘master’?
Yes, but now i believe that that was fuzzy thinking, not to mention
in disregard of my agreement to not do so made several months ago
(which i didn't remember until just after pressing RET -- sigh). :-(
I will push only to ttn/* henceforth.
Could you please undo the damage on ‘master’?
FWIW, the commit edb3cfc37de8c216e3b1c06970ef39e3638560be,
aka "[maint] Add configure.ac abstraction: GUILE_CONFIG_SCRIPT",
is ready for review.
The other commit 0faca15c33cfbe1ef25fd6b4bbc7f92b57659345,
aka "Init shell var properly in git-version-gen", is functional,
and would also be ready for review, were it not my belief that the
change should actually be effected by import from upstream (gnulib).
Am i missing something? That's the commit i wanted to omit.
thi
next prev parent reply other threads:[~2010-06-15 19:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-15 11:36 git push weird? Thien-Thi Nguyen
2010-06-15 14:41 ` Xiangfu Liu
2010-06-15 17:54 ` Thien-Thi Nguyen
2010-06-15 18:56 ` Ludovic Courtès
2010-06-15 19:39 ` Thien-Thi Nguyen [this message]
2010-06-15 20:56 ` Ludovic Courtès
2010-06-15 21:07 ` Andy Wingo
2010-06-15 21:56 ` Thien-Thi Nguyen
2010-06-15 22:15 ` Andy Wingo
2010-06-16 2:14 ` Thien-Thi Nguyen
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
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871vc8nl0g.fsf@ambire.localdomain \
--to=ttn@gnuvola.org \
--cc=guile-devel@gnu.org \
--cc=ludo@gnu.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).