git/git-pull.sh, branch v1.6.4.3

pull: support rebased upstream + fetch + pull --rebase

2009-07-19T17:29:38Z

You cannot do a "git pull --rebase" with a rebased upstream, if you have already run "git fetch". Try to behave as if the "git fetch" was not run. In other words, find the fork point of the current branch, where the tip of upstream branch used to be, and use it as the upstream parameter of "git rebase". This patch computes the fork point by walking the reflog to find the first commit which is an ancestor of the current branch. Maybe there are smarter ways to compute it, but this is a straight forward implementation. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

Merge branch 'sb/pull-rebase'

2009-06-21T04:47:13Z

* sb/pull-rebase: parse-remote: remove unused functions parse-remote: support default reflist in get_remote_merge_branch parse-remote: function to get the tracking branch to be merge

pull, rebase: simplify to use die()

2009-06-15T04:14:10Z

Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

parse-remote: function to get the tracking branch to be merge

2009-06-12T02:49:59Z

The only user of get_remote_refs_for_fetch was "git pull --rebase" and it only wanted the tracking branch to be merge. So, add a simple function (get_remote_merge_branch) with this new meaning. No behavior changes. The new function behaves like the old code in "git pull --rebase". In particular, it only works with the default refspec mapping and with remote branches, not tags. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

Convert to use quiet option when available

2009-04-23T02:05:37Z

A minor fix that eliminates usage of "2>/dev/null" when --quiet or -q has already been implemented. Signed-off-by: Dan Loewenherz Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-04-09T06:47:23Z

* maint: Start 1.6.2.3 preparation process_{tree,blob}: Remove useless xstrdup calls git-pull.sh: better warning message for "git pull" on detached head. Conflicts: RelNotes

git-pull.sh: better warning message for "git pull" on detached head.

2009-04-08T07:39:51Z

Otherwise, git complains about not finding a branch to pull from in 'branch..merge', which is hardly understandable. While we're there, reword the sentences slightly. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

git-pull: Allow --stat and --no-stat to be used with --rebase

2009-03-03T07:22:54Z

Forwards the --stat, --no-stat, and --summary options on to git-rebase. Signed-off-by: Tor Arne Vestbø Signed-off-by: Junio C Hamano

disallow providing multiple upstream branches to rebase, pull --rebase

2009-02-18T19:14:04Z

It does not make sense to provide multiple upstream branches to either git pull --rebase, or to git rebase, so disallow both. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

pull: use git rev-parse -q

2008-12-03T22:27:17Z

Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano