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

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

Retain multiple -q/-v occurrences in git pull

2008-11-19T00:10:05Z

To support counting -q/-v options in git pull retain them by concatenating. Signed-off-by: Tuncer Ayaz Signed-off-by: Junio C Hamano

Teach/Fix pull/fetch -q/-v options

2008-11-15T01:18:32Z

Implement git-pull --quiet and git-pull --verbose by adding the options to git-pull and fixing verbosity handling in git-fetch. Signed-off-by: Junio C Hamano

pull: allow "git pull origin $something:$current_branch" into an unborn branch

2008-10-17T18:26:20Z

Some misguided documents floating on the Net suggest this sequence: mkdir newdir && cd newdir git init git remote add origin $url git pull origin master:master "git pull" has known about misguided "pull" that lets the underlying fetch update the current branch for a long time. It also has known about "git pull origin master" into a branch yet to be born. These two workarounds however were not aware of the existence of each other and did not work well together. This fixes it. Signed-off-by: Junio C Hamano

Ignore dirty submodule states in "git pull --rebase"

2008-07-23T18:36:56Z

This is a companion patch to 6848d58c(Ignore dirty submodule states during rebase and stash). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano