summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Libravatar Junio C Hamano1-2/+9
2013-06-20pull: merge into unborn by fast-forwarding from empty treeLibravatar Thomas Rast1-1/+8
2013-06-20pull: update unborn branch tip after indexLibravatar Jeff King1-2/+2
2013-03-31merge/pull: verify GPG signatures of commits being mergedLibravatar Sebastian Götte1-2/+8
2013-03-16pull: Apply -q and -v options to rebase mode as wellLibravatar Peter Eisentraut1-1/+1
2012-10-25git-pull: Avoid merge-base on detached headLibravatar Phil Hord1-0/+1
2012-03-04Make git-{pull,rebase} message without tracking information friendlierLibravatar Carlos Martín Nieto1-1/+1
2012-02-12"git pull" doesn't know "--edit"Libravatar Linus Torvalds1-2/+6
2011-12-09Merge branch 'ab/pull-rebase-config'Libravatar Junio C Hamano1-0/+4
2011-11-07pull: introduce a pull.rebase option to enable --rebaseLibravatar Ævar Arnfjörð Bjarmason1-0/+4
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Libravatar Junio C Hamano1-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterLibravatar Jeff King1-1/+1
2011-10-05use -h for synopsis and --help for manpage consistentlyLibravatar Clemens Buchacher1-1/+1
2011-08-25Merge branch 'js/i18n-scripts'Libravatar Junio C Hamano1-5/+2
2011-08-08Merge branch 'oa/pull-reflog'Libravatar Junio C Hamano1-1/+1
2011-08-08pull: take advantage of eval_gettextlnLibravatar Jon Seymour1-5/+2
2011-08-01pull: remove extra space from reflog messageLibravatar Ori Avtalion1-1/+1
2011-05-21i18n: git-pull eval_gettext + warning messageLibravatar Ævar Arnfjörð Bjarmason1-3/+6
2011-05-21i18n: git-pull eval_gettext + die messageLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-pull die messagesLibravatar Ævar Arnfjörð Bjarmason1-9/+9
2011-05-21i18n: git-pull add git-sh-i18nLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2011-04-28Merge branch 'mz/rebase'Libravatar Junio C Hamano1-28/+4
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Libravatar Junio C Hamano1-0/+3
2011-03-25pull: do not clobber untracked files on initial pullLibravatar Jeff King1-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-2/+4
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionLibravatar Jens Lehmann1-0/+3
2011-02-21pull: propagate --progress to mergeLibravatar Jeff King1-2/+4
2011-02-15pull: do not display fetch usage on --help-allLibravatar Michael J Gruber1-1/+1
2011-02-10rebase: use @{upstream} if no upstream specifiedLibravatar Martin von Zweigbergk1-28/+4
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Libravatar Junio C Hamano1-2/+8
2010-11-12Add the 'fetch.recurseSubmodules' config settingLibravatar Jens Lehmann1-0/+3
2010-11-12fetch/pull: Add the --recurse-submodules optionLibravatar Jens Lehmann1-2/+5
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageLibravatar Ramkumar Ramachandra1-4/+1
2010-08-21Merge branch 'en/rebase-against-rebase-fix'Libravatar Junio C Hamano1-0/+9
2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesLibravatar Elijah Newren1-0/+9
2010-05-25pull: do nothing on --dry-runLibravatar Jeff King1-1/+6
2010-03-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-03-20pull: replace unnecessary sed invocationLibravatar Stephen Boyd1-1/+1
2010-02-24fetch and pull: learn --progressLibravatar Tay Ray Chuan1-2/+4
2010-01-24pull: re-fix command line generationLibravatar Junio C Hamano1-1/+1
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-5/+25
2010-01-17pull: Fix parsing of -X<option>Libravatar Junio C Hamano1-7/+14
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun1-2/+15
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-2/+23
2009-12-08Merge branch 'maint'Libravatar Junio C Hamano1-15/+33
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationLibravatar Junio C Hamano1-3/+3
2009-12-03pull: clarify advice for the unconfigured error caseLibravatar Jan Krüger1-15/+33
2009-12-02git-pull.sh: Fix call to git-merge for new command formatLibravatar Horst H. von Brand1-3/+3
2009-11-15Merge branch 'fc/doc-fast-forward'Libravatar Junio C Hamano1-1/+1
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyLibravatar Björn Gustavsson1-2/+5