summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)Author
2013-07-12Merge branch 'jk/pull-to-integrate'Junio C Hamano
2013-07-08pull: change the description to "integrate" changesJohn Keeping
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano
2013-06-20pull: merge into unborn by fast-forwarding from empty treeThomas Rast
2013-06-20pull: update unborn branch tip after indexJeff King
2013-04-01merge/pull: verify GPG signatures of commits being mergedSebastian Götte
2013-03-17pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut
2012-10-25git-pull: Avoid merge-base on detached headPhil Hord
2012-03-05Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto
2012-02-13"git pull" doesn't know "--edit"Linus Torvalds
2011-12-09Merge branch 'ab/pull-rebase-config'Junio C Hamano
2011-11-07pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason
2011-10-18Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King
2011-10-05use -h for synopsis and --help for manpage consistentlyClemens Buchacher
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano
2011-08-08Merge branch 'oa/pull-reflog'Junio C Hamano
2011-08-08pull: take advantage of eval_gettextlnJon Seymour
2011-08-01pull: remove extra space from reflog messageOri Avtalion
2011-05-21i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-pull die messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason
2011-04-28Merge branch 'mz/rebase'Junio C Hamano
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano
2011-03-25pull: do not clobber untracked files on initial pullJeff King
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann
2011-02-21pull: propagate --progress to mergeJeff King
2011-02-15pull: do not display fetch usage on --help-allMichael J Gruber
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra
2010-08-22Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano
2010-08-13pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren
2010-05-25pull: do nothing on --dry-runJeff King
2010-03-20Merge branch 'maint'Junio C Hamano
2010-03-20pull: replace unnecessary sed invocationStephen Boyd
2010-02-24fetch and pull: learn --progressTay Ray Chuan
2010-01-24pull: re-fix command line generationJunio C Hamano
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18pull: Fix parsing of -X<option>Junio C Hamano
2010-01-18Teach git-pull to pass -X<option> to git-mergeAvery Pennarun
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy
2009-12-09Merge branch 'maint'Junio C Hamano
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano
2009-12-03pull: clarify advice for the unconfigured error caseJan Krüger
2009-12-02git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand