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