Age | Commit message (Expand) | Author | Files | Lines |
2009-12-08 | Revert recent "git merge <msg> HEAD <commit>..." deprecation | Junio C Hamano | 1 | -3/+3 |
2009-12-03 | pull: clarify advice for the unconfigured error case | Jan Krüger | 1 | -15/+33 |
2009-12-02 | git-pull.sh: Fix call to git-merge for new command format | Horst H. von Brand | 1 | -3/+3 |
2009-11-15 | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 1 | -1/+1 |
2009-10-30 | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 1 | -2/+5 |
2009-10-24 | Use 'fast-forward' all over the place | Felipe Contreras | 1 | -1/+1 |
2009-10-09 | pull: improve advice for unconfigured error case | Jeff King | 1 | -4/+12 |
2009-10-05 | git-pull: dead code removal | Junio C Hamano | 1 | -8/+1 |
2009-09-22 | pull: Clarify "helpful" message for another corner case | Junio C Hamano | 1 | -1/+6 |
2009-08-12 | allow pull --rebase on branch yet to be born | Jeff King | 1 | -5/+13 |
2009-07-19 | pull: support rebased upstream + fetch + pull --rebase | Santi Béjar | 1 | -3/+11 |
2009-06-20 | Merge branch 'sb/pull-rebase' | Junio C Hamano | 1 | -5/+2 |
2009-06-14 | pull, rebase: simplify to use die() | Stephen Boyd | 1 | -4/+2 |
2009-06-11 | parse-remote: function to get the tracking branch to be merge | Santi Béjar | 1 | -5/+2 |
2009-04-22 | Convert to use quiet option when available | Dan Loewenherz | 1 | -1/+1 |
2009-04-08 | Merge branch 'maint' | Junio C Hamano | 1 | -17/+25 |
2009-04-08 | git-pull.sh: better warning message for "git pull" on detached head. | Matthieu Moy | 1 | -17/+25 |
2009-03-02 | git-pull: Allow --stat and --no-stat to be used with --rebase | Tor Arne Vestbø | 1 | -5/+5 |
2009-02-18 | disallow providing multiple upstream branches to rebase, pull --rebase | Jay Soffian | 1 | -0/+5 |
2008-12-03 | pull: use git rev-parse -q | Miklos Vajna | 1 | -4/+4 |
2008-11-18 | Retain multiple -q/-v occurrences in git pull | Tuncer Ayaz | 1 | -2/+2 |
2008-11-14 | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 1 | -3/+7 |
2008-10-17 | pull: allow "git pull origin $something:$current_branch" into an unborn branch | Junio C Hamano | 1 | -2/+2 |
2008-07-23 | Ignore dirty submodule states in "git pull --rebase" | Johannes Schindelin | 1 | -3/+3 |
2008-07-13 | Make usage strings dash-less | Stephan Beyer | 1 | -1/+1 |
2008-05-22 | pull --rebase: exit early when the working directory is dirty | Johannes Schindelin | 1 | -0/+5 |
2008-04-12 | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 1 | -3/+5 |
2008-04-12 | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 1 | -9/+7 |
2008-02-22 | pull: pass --strategy along to to rebase | Jay Soffian | 1 | -1/+2 |
2008-01-26 | pull --rebase: be cleverer with rebased upstream branches | Johannes Schindelin | 1 | -1/+11 |
2007-12-28 | "git pull --tags": error out with a better message. | Junio C Hamano | 1 | -26/+40 |
2007-11-28 | Teach 'git pull' about --rebase | Johannes Schindelin | 1 | -1/+10 |
2007-11-06 | scripts: Add placeholders for OPTIONS_SPEC | Junio C Hamano | 1 | -0/+1 |
2007-10-29 | Teach git-pull about --[no-]ff, --no-squash and --commit | Lars Hjemli | 1 | -3/+11 |
2007-10-02 | Make git-pull complain and give advice when there is nothing to merge with | Federico Mena Quintero | 1 | -4/+18 |
2007-09-23 | Supplant the "while case ... break ;; esac" idiom | David Kastrup | 1 | -3/+3 |
2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 1 | -8/+8 |
2007-05-24 | Add a configuration option to control diffstat after merge | Alex Riesen | 1 | -0/+3 |
2007-01-15 | git-pull: disallow implicit merging to detached HEAD | Jeff King | 1 | -2/+11 |
2007-01-12 | Allow whole-tree operations to be started from a subdirectory | Junio C Hamano | 1 | -1/+3 |
2007-01-10 | Disallow working directory commands in a bare repository. | Shawn O. Pearce | 1 | -0/+1 |
2007-01-01 | fail pull/merge early in the middle of conflicted merge | Junio C Hamano | 1 | -0/+3 |
2006-12-28 | Allow git-merge to select the default strategy. | Shawn O. Pearce | 1 | -18/+0 |
2006-12-28 | Ensure `git-pull` fails if `git-merge` fails. | Shawn O. Pearce | 1 | -1/+1 |
2006-12-28 | Use GIT_REFLOG_ACTION environment variable instead. | Shawn O. Pearce | 1 | -3/+3 |
2006-12-19 | Move "no merge candidate" warning into git-pull | Josef Weidendorfer | 1 | -0/+4 |
2006-11-16 | git-pull: allow pulling into an empty repository | Linus Torvalds | 1 | -2/+14 |
2006-10-10 | git-pull: we say commit X, not X commit. | Junio C Hamano | 1 | -1/+1 |
2006-07-11 | Log ref changes made by git-merge and git-pull. | Shawn Pearce | 1 | -1/+2 |
2006-07-10 | Log ref changes made by git-fetch and git-pull. | Shawn Pearce | 1 | -1/+1 |