Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 17, 2014
  1. @johnkeeping @gitster

    pull: suppress error when no remoteref is found

    johnkeeping authored gitster committed
    Commit 48059e4 (pull: use merge-base --fork-point when appropriate,
    2013-12-08) incorrectly assumes that get_remote_merge_branch will either
    yield a non-empty string or return an error, but there are circumstances
    where it will yield an empty string.
    
    The previous code then invoked git-rev-list with no arguments, which
    results in an error suppressed by redirecting stderr to /dev/null.  Now
    we invoke git-merge-base with an empty branch name, which also results
    in an error.  Suppress this in the same way.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 9, 2013
  1. @johnkeeping @gitster

    pull: use merge-base --fork-point when appropriate

    johnkeeping authored gitster committed
    Since commit d96855f (merge-base: teach "--fork-point" mode, 2013-10-23)
    we can replace a shell loop in git-pull with a single call to
    git-merge-base.  So let's do so.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 8, 2013
  1. @johnkeeping @gitster

    pull: change the description to "integrate" changes

    johnkeeping authored gitster committed
    Since git-pull learned the --rebase option it has not just been about
    merging changes from a remote repository (where "merge" is in the sense
    of "git merge").  Change the description to use "integrate" instead of
    "merge" in order to reflect this.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.