git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Santi Béjar" <santi@agolina.net>
To: git@vger.kernel.org
Subject: [PATCHv4 0/4] git pull --rebase fixes and cleanup
Date: Fri, 12 Jun 2009 00:39:17 +0200	[thread overview]
Message-ID: <1244759961-4750-1-git-send-email-santi@agolina.net> (raw)

Changes since v3:
  - Extend 1/4 commit message to explain why there are not behavior changes

Santi Béjar (4):
  parse-remote: function to get the tracking branch to be merge
  parse-remote: support default reflist in get_remote_merge_branch
  t5520-pull: --rebase with rebased upstream and two branches
  parse-remote: remove unused functions

 Documentation/git-parse-remote.txt |   20 ----
 git-parse-remote.sh                |  222 ++++-------------------------------
 git-pull.sh                        |    7 +-
 t/t5520-pull.sh                    |   29 +++++
 4 files changed, 57 insertions(+), 221 deletions(-)

             reply	other threads:[~2009-06-11 22:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-11 22:39 Santi Béjar [this message]
2009-06-11 22:39 ` [PATCHv4 1/4] parse-remote: function to get the tracking branch to be merge Santi Béjar
2009-06-11 22:39 ` [PATCHv4 2/4] parse-remote: support default reflist in get_remote_merge_branch Santi Béjar
2009-06-12  3:09   ` Junio C Hamano
2009-06-12  6:58     ` Santi Béjar
2009-06-11 22:39 ` [PATCHv4 3/4] t5520-pull: --rebase with rebased upstream and two branches Santi Béjar
2009-06-11 23:19   ` Junio C Hamano
2009-06-12  2:57   ` Junio C Hamano
2009-06-11 22:39 ` [PATCHv4 4/4] parse-remote: remove unused functions Santi Béjar

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=1244759961-4750-1-git-send-email-santi@agolina.net \
    --to=santi@agolina.net \
    --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;
as well as URLs for NNTP newsgroup(s).