From: Eric James Michael Ritz <Eric@cybersprocket•com>
To: git@vger•kernel.org
Subject: Replacing a Remote Branch
Date: Fri, 23 Jul 2010 16:14:51 -0400 [thread overview]
Message-ID: <4C49F83B.4060903@cybersprocket.com> (raw)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello everyone. I have a question about pushing branches that I hope
a more experienced user could help me with.
Commonly I run into this situation:
1. I have pushed a topic branch out to a repo where other developers
on my team push their work until its ready to be merged.
2. I realized I need to perform some ‘destructive’ action like
‘rebase -i’ or amend the last commit to fix a typo in the message.
3. Then I want to push the changed branch as a replacement.
Currently I deal with this by running
$ git push origin :foo && git push origin foo
to replace `foo`. But is there a shorter way to do this? I thought
that writing something like
$ git push origin +foo:foo
may have the intended effect, but I still get a rejection due to a
non-fast-forward, so I am likely misunderstanding the purpose of `+`.
If there is any short-cut for this, I would greatly appreciate it.
And if not, writing a simple script is not a huge hassle :)
- --
Eric James Michael Ritz
Cyber Sprocket Labs
(843) 225-3830
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJMSfg7AAoJEEHUZXw5hMWshwAIALOnsArQIWoxXNmOVNvi3ptd
oXpUXbfX2ZgMnhOQAYmJXYjkqc/fKFh+MultDP1PRgQwPdPCEUfK/n5TEJXB66Jf
nsgnGWIHk7nULuKJmCb9BrDd+xVI4tvbhI3gZYXrypoWdrfUat9rlUL52+eiAXp7
CG/FQrSoFRydREGUuAi1UNtTPt9UG2MT65dEx/S8wqRn8phpJHZI94mKOVZ58lI1
oQDfx+Ox6p2RJG/HRrX7/jWOiGzMk3Ix/cToAaltBWWp7MgvDq31pjrN0TZJfUu+
+vcgafAqseXDDuStlEGd8O5WT+uRYjn9/K3YHf55MKsMvKVzNxgS8IHQGzC+Yk4=
=/0uY
-----END PGP SIGNATURE-----
next reply other threads:[~2010-07-23 20:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 20:14 Eric James Michael Ritz [this message]
2010-07-23 20:48 ` Replacing a Remote Branch Thomas Rast
2010-07-23 20:52 ` Eric James Michael Ritz
2010-07-24 1:17 ` bill lam
2010-07-24 16:03 ` [PATCH 1/2] Document receive.denyDeleteCurrent Thomas Rast
2010-07-24 16:03 ` [PATCH 2/2] Documentation/git-push: Explain status output in more detail Thomas Rast
2010-07-24 16:07 ` [PATCH v1.1 1/2] Document receive.denyDeleteCurrent Thomas Rast
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=4C49F83B.4060903@cybersprocket.com \
--to=eric@cybersprocket$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/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