| Commit message (Expand) | Author | Age |
* | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 |
|\ |
|
| * | pull: propagate --progress to merge | Jeff King | 2011-02-21 |
* | | pull: do not display fetch usage on --help-all | Michael J Gruber | 2011-02-15 |
|/ |
|
* | Merge branch 'jl/fetch-submodule-recursive' | Junio C Hamano | 2010-12-16 |
|\ |
|
| * | Add the 'fetch.recurseSubmodules' config setting | Jens Lehmann | 2010-11-12 |
| * | fetch/pull: Add the --recurse-submodules option | Jens Lehmann | 2010-11-12 |
* | | Porcelain scripts: Rewrite cryptic "needs update" error message | Ramkumar Ramachandra | 2010-10-28 |
|/ |
|
* | Merge branch 'en/rebase-against-rebase-fix' | Junio C Hamano | 2010-08-21 |
|\ |
|
| * | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 2010-08-12 |
* | | pull: do nothing on --dry-run | Jeff King | 2010-05-25 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-03-20 |
|\ \ |
|
| * | | pull: replace unnecessary sed invocation | Stephen Boyd | 2010-03-20 |
| |/ |
|
* | | fetch and pull: learn --progress | Tay Ray Chuan | 2010-02-24 |
|/ |
|
* | pull: re-fix command line generation | Junio C Hamano | 2010-01-24 |
* | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
|\ |
|
| * | pull: Fix parsing of -X<option> | Junio C Hamano | 2010-01-17 |
| * | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-17 |
* | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-12-08 |
|\ \ |
|
| * | | pull: clarify advice for the unconfigured error case | Jan Krüger | 2009-12-03 |
* | | | Revert recent "git merge <msg> HEAD <commit>..." deprecation | Junio C Hamano | 2009-12-08 |
* | | | git-pull.sh: Fix call to git-merge for new command format | Horst H. von Brand | 2009-12-02 |
| |/
|/| |
|
* | | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 2009-11-15 |
|\ \ |
|
| * | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 |
| |/ |
|
* | | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 |
|/ |
|
* | pull: improve advice for unconfigured error case | Jeff King | 2009-10-09 |
* | git-pull: dead code removal | Junio C Hamano | 2009-10-05 |
* | pull: Clarify "helpful" message for another corner casev1.6.5-rc2 | Junio C Hamano | 2009-09-22 |
* | allow pull --rebase on branch yet to be born | Jeff King | 2009-08-12 |
* | pull: support rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 |
* | Merge branch 'sb/pull-rebase' | Junio C Hamano | 2009-06-20 |
|\ |
|
| * | parse-remote: function to get the tracking branch to be merge | Santi Béjar | 2009-06-11 |
* | | pull, rebase: simplify to use die() | Stephen Boyd | 2009-06-14 |
|/ |
|
* | Convert to use quiet option when available | Dan Loewenherz | 2009-04-22 |
* | Merge branch 'maint' | Junio C Hamano | 2009-04-08 |
|\ |
|
| * | git-pull.sh: better warning message for "git pull" on detached head. | Matthieu Moy | 2009-04-08 |
* | | git-pull: Allow --stat and --no-stat to be used with --rebase | Tor Arne Vestbø | 2009-03-02 |
|/ |
|
* | disallow providing multiple upstream branches to rebase, pull --rebase | Jay Soffian | 2009-02-18 |
* | pull: use git rev-parse -q | Miklos Vajna | 2008-12-03 |
* | Retain multiple -q/-v occurrences in git pull | Tuncer Ayaz | 2008-11-18 |
* | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 2008-11-14 |
* | pull: allow "git pull origin $something:$current_branch" into an unborn branch | Junio C Hamano | 2008-10-17 |
* | Ignore dirty submodule states in "git pull --rebase" | Johannes Schindelin | 2008-07-23 |
* | Make usage strings dash-less | Stephan Beyer | 2008-07-13 |
* | pull --rebase: exit early when the working directory is dirty | Johannes Schindelin | 2008-05-22 |
* | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 |
* | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 |
* | pull: pass --strategy along to to rebase | Jay Soffian | 2008-02-22 |
* | pull --rebase: be cleverer with rebased upstream branches | Johannes Schindelin | 2008-01-26 |
* | "git pull --tags": error out with a better message. | Junio C Hamano | 2007-12-28 |