| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/pull-to-integrate' | Junio C Hamano | 2013-07-12 | 1 | -1/+1 |
|\ |
|
| * | pull: change the description to "integrate" changesjk/pull-to-integrate | John Keeping | 2013-07-08 | 1 | -1/+1 |
* | | Merge branch 'jk/pull-into-dirty-unborn' | Junio C Hamano | 2013-06-27 | 1 | -2/+9 |
|\ \
| |/
|/| |
|
| * | pull: merge into unborn by fast-forwarding from empty tree | Thomas Rast | 2013-06-20 | 1 | -1/+8 |
| * | pull: update unborn branch tip after index | Jeff King | 2013-06-20 | 1 | -2/+2 |
* | | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 1 | -2/+8 |
|/ |
|
* | pull: Apply -q and -v options to rebase mode as well | Peter Eisentraut | 2013-03-16 | 1 | -1/+1 |
* | git-pull: Avoid merge-base on detached head | Phil Hord | 2012-10-25 | 1 | -0/+1 |
* | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-message | Carlos Martín Nieto | 2012-03-04 | 1 | -1/+1 |
* | "git pull" doesn't know "--edit"lt/pull-no-edit | Linus Torvalds | 2012-02-12 | 1 | -2/+6 |
* | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 2011-12-09 | 1 | -0/+4 |
|\ |
|
| * | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-config | Ævar Arnfjörð Bjarmason | 2011-11-07 | 1 | -0/+4 |
* | | Merge branch 'jk/pull-rebase-with-work-tree' | Junio C Hamano | 2011-10-17 | 1 | -1/+1 |
|\ \ |
|
| * | | pull,rebase: handle GIT_WORK_TREE better | Jeff King | 2011-10-13 | 1 | -1/+1 |
* | | | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-help | Clemens Buchacher | 2011-10-05 | 1 | -1/+1 |
* | | | Merge branch 'js/i18n-scripts' | Junio C Hamano | 2011-08-25 | 1 | -5/+2 |
|\ \ \ |
|
| * | | | pull: take advantage of eval_gettextln | Jon Seymour | 2011-08-08 | 1 | -5/+2 |
* | | | | Merge branch 'oa/pull-reflog' | Junio C Hamano | 2011-08-08 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | pull: remove extra space from reflog message | Ori Avtalion | 2011-08-01 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | i18n: git-pull eval_gettext + warning message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -3/+6 |
* | | | i18n: git-pull eval_gettext + die message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -3/+3 |
* | | | i18n: git-pull die messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -9/+9 |
* | | | i18n: git-pull add git-sh-i18n | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -0/+1 |
|/ / |
|
* | | Merge branch 'mz/rebase' | Junio C Hamano | 2011-04-28 | 1 | -28/+4 |
|\ \ |
|
| * | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 | 1 | -28/+4 |
| |/ |
|
* | | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 | 1 | -0/+3 |
|\ \ |
|
| * | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules option | Jens Lehmann | 2011-03-09 | 1 | -0/+3 |
* | | | pull: do not clobber untracked files on initial pull | Jeff King | 2011-03-25 | 1 | -1/+1 |
* | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -2/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | pull: propagate --progress to merge | Jeff King | 2011-02-21 | 1 | -2/+4 |
| |/ |
|
* | | pull: do not display fetch usage on --help-all | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'jl/fetch-submodule-recursive' | Junio C Hamano | 2010-12-16 | 1 | -2/+8 |
|\ |
|
| * | Add the 'fetch.recurseSubmodules' config setting | Jens Lehmann | 2010-11-12 | 1 | -0/+3 |
| * | fetch/pull: Add the --recurse-submodules option | Jens Lehmann | 2010-11-12 | 1 | -2/+5 |
* | | 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 |
| |/
|/| |
|