Age | Commit message (Expand) | Author | Files | Lines |
2011-12-09 | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 1 | -0/+4 |
2011-11-07 | pull: introduce a pull.rebase option to enable --rebase | Ævar Arnfjörð Bjarmason | 1 | -0/+4 |
2011-10-17 | Merge branch 'jk/pull-rebase-with-work-tree' | Junio C Hamano | 1 | -1/+1 |
2011-10-13 | pull,rebase: handle GIT_WORK_TREE better | Jeff King | 1 | -1/+1 |
2011-10-05 | use -h for synopsis and --help for manpage consistently | Clemens Buchacher | 1 | -1/+1 |
2011-08-25 | Merge branch 'js/i18n-scripts' | Junio C Hamano | 1 | -5/+2 |
2011-08-08 | Merge branch 'oa/pull-reflog' | Junio C Hamano | 1 | -1/+1 |
2011-08-08 | pull: take advantage of eval_gettextln | Jon Seymour | 1 | -5/+2 |
2011-08-01 | pull: remove extra space from reflog message | Ori Avtalion | 1 | -1/+1 |
2011-05-21 | i18n: git-pull eval_gettext + warning message | Ævar Arnfjörð Bjarmason | 1 | -3/+6 |
2011-05-21 | i18n: git-pull eval_gettext + die message | Ævar Arnfjörð Bjarmason | 1 | -3/+3 |
2011-05-21 | i18n: git-pull die messages | Ævar Arnfjörð Bjarmason | 1 | -9/+9 |
2011-05-21 | i18n: git-pull add git-sh-i18n | Ævar Arnfjörð Bjarmason | 1 | -0/+1 |
2011-04-28 | Merge branch 'mz/rebase' | Junio C Hamano | 1 | -28/+4 |
2011-04-04 | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 1 | -0/+3 |
2011-03-25 | pull: do not clobber untracked files on initial pull | Jeff King | 1 | -1/+1 |
2011-03-19 | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 1 | -2/+4 |
2011-03-09 | fetch/pull: Add the 'on-demand' value to the --recurse-submodules option | Jens Lehmann | 1 | -0/+3 |
2011-02-21 | pull: propagate --progress to merge | Jeff King | 1 | -2/+4 |
2011-02-15 | pull: do not display fetch usage on --help-all | Michael J Gruber | 1 | -1/+1 |
2011-02-10 | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 1 | -28/+4 |
2010-12-16 | Merge branch 'jl/fetch-submodule-recursive' | Junio C Hamano | 1 | -2/+8 |
2010-11-12 | Add the 'fetch.recurseSubmodules' config setting | Jens Lehmann | 1 | -0/+3 |
2010-11-12 | fetch/pull: Add the --recurse-submodules option | Jens Lehmann | 1 | -2/+5 |
2010-10-28 | Porcelain scripts: Rewrite cryptic "needs update" error message | Ramkumar Ramachandra | 1 | -4/+1 |
2010-08-21 | Merge branch 'en/rebase-against-rebase-fix' | Junio C Hamano | 1 | -0/+9 |
2010-08-12 | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 1 | -0/+9 |
2010-05-25 | pull: do nothing on --dry-run | Jeff King | 1 | -1/+6 |
2010-03-20 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+1 |
2010-03-20 | pull: replace unnecessary sed invocation | Stephen Boyd | 1 | -1/+1 |
2010-02-24 | fetch and pull: learn --progress | Tay Ray Chuan | 1 | -2/+4 |
2010-01-24 | pull: re-fix command line generation | Junio C Hamano | 1 | -1/+1 |
2010-01-20 | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 1 | -5/+25 |
2010-01-17 | pull: Fix parsing of -X<option> | Junio C Hamano | 1 | -7/+14 |
2010-01-17 | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 1 | -2/+15 |
2010-01-12 | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 1 | -2/+23 |
2009-12-08 | Merge branch 'maint' | Junio C Hamano | 1 | -15/+33 |
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 |