From: Marc Branchaud <marcnarc@xiplink.com>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: Jay Soffian <jaysoffian@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH 4/4] remote: new show output style
Date: Thu, 19 Feb 2009 11:31:11 -0500 [thread overview]
Message-ID: <499D894F.90508@xiplink.com> (raw)
In-Reply-To: <bd6139dc0902190816m3c70923eg132e89bff28a216f@mail.gmail.com>
Sverre Rabbelier wrote:
>
> A non-fast forward update in terms of pushing means you overwrite
> whatever the remote currently has set as that branch's head. This can
> be desirable in a private repository or branch, but is usually not
> desired on shared branches.
Let me see if I understand what you're saying. If my local repo has
o--o--o--A--B <-- origin/thing
\
X--Y--Z <-- mystuff
and I do 'git push origin +mystuff:thing', does the origin end up with
A--B <-- (branch with no symbolic reference)
/
o--o--o--X--Y--Z <-- origin/thing
So commits A and B are basically left dangling?
If that's the case, then I'd say "replaces" or "overwrites" is the right word to use in the 'remote show' output. But more importantly, I think the 'git push' man page needs to explain this!
M.
next prev parent reply other threads:[~2009-02-19 16:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-19 5:14 [PATCH 0/4] Improve "remote show" output Jay Soffian
2009-02-19 5:14 ` [PATCH 1/4] remote: minor code cleanups in preparation for changing "show" output Jay Soffian
2009-02-19 5:14 ` [PATCH 2/4] remote: move append_ref_to_tracked_list to get rid of prototype Jay Soffian
2009-02-19 5:14 ` [PATCH 3/4] string-list: add for_each_string_list() Jay Soffian
2009-02-19 5:14 ` [PATCH 4/4] remote: new show output style Jay Soffian
2009-02-19 16:03 ` Marc Branchaud
2009-02-19 16:16 ` Sverre Rabbelier
2009-02-19 16:31 ` Marc Branchaud [this message]
2009-02-19 16:33 ` Sverre Rabbelier
2009-02-19 16:17 ` Rostislav Svoboda
2009-02-19 17:57 ` Jay Soffian
2009-02-19 17:59 ` Jay Soffian
2009-02-19 18:58 ` Julian Phillips
2009-02-20 22:34 ` Marc Branchaud
2009-02-20 22:55 ` Jay Soffian
2009-02-19 19:29 ` Johannes Sixt
2009-02-19 19:51 ` Jay Soffian
2009-02-20 7:19 ` [PATCH 1/4] remote: minor code cleanups in preparation for changing "show" output Junio C Hamano
2009-02-20 10:50 ` Jay Soffian
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=499D894F.90508@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jaysoffian@gmail.com \
--cc=srabbelier@gmail.com \
/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.