summaryrefslogtreecommitdiffstats
path: root/git-pull.sh
AgeCommit message (Expand)AuthorLines
2014-08-28merge, pull: stop advising 'commit -a' in case of conflictMatthieu Moy-1/+1
2014-06-12Sync with maintJunio C Hamano-2/+0
2014-06-12pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny-2/+0
2014-04-23git-pull.sh: use the $( ... ) construct for command substitutionElia Pinto-1/+1
2014-02-27Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano-1/+12
2014-02-27Merge branch 'da/pull-ff-configuration'Junio C Hamano-1/+16
2014-02-11pull: add the --gpg-sign option.brian m. carlson-1/+12
2014-01-17Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano-1/+1
2014-01-17pull: suppress error when no remoteref is foundJohn Keeping-1/+1
2014-01-15pull: add --ff-only to the help textDavid Aguilar-1/+1
2014-01-15pull: add pull.ff configurationDavid Aguilar-0/+15
2013-12-27Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano-9/+1
2013-12-09pull: use merge-base --fork-point when appropriateJohn Keeping-9/+1
2013-10-30fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty-1/+1
2013-09-17Merge branch 'fc/trivial'Junio C Hamano-3/+2
2013-09-08pull: use $curr_branch_short moreRené Scharfe-3/+2
2013-09-04pull: allow pull to preserve merges when rebasingStephen Haberman-5/+26
2013-07-12Merge branch 'jk/pull-to-integrate'Junio C Hamano-1/+1
2013-07-08pull: change the description to "integrate" changesJohn Keeping-1/+1
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano-2/+9
2013-06-20pull: merge into unborn by fast-forwarding from empty treeThomas Rast-1/+8
2013-06-20pull: update unborn branch tip after indexJeff King-2/+2
2013-03-31merge/pull: verify GPG signatures of commits being mergedSebastian Götte-2/+8
2013-03-16pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut-1/+1
2012-10-25git-pull: Avoid merge-base on detached headPhil Hord-0/+1
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto-1/+1
2012-02-12"git pull" doesn't know "--edit"Linus Torvalds-2/+6
2011-12-09Merge branch 'ab/pull-rebase-config'Junio C Hamano-0/+4
2011-11-07pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason-0/+4
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King-1/+1
2011-10-05use -h for synopsis and --help for manpage consistentlyClemens Buchacher-1/+1
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano-5/+2
2011-08-08Merge branch 'oa/pull-reflog'Junio C Hamano-1/+1
2011-08-08pull: take advantage of eval_gettextlnJon Seymour-5/+2
2011-08-01pull: remove extra space from reflog messageOri Avtalion-1/+1
2011-05-21i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason-3/+6
2011-05-21i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason-3/+3
2011-05-21i18n: git-pull die messagesÆvar Arnfjörð Bjarmason-9/+9
2011-05-21i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason-0/+1
2011-04-28Merge branch 'mz/rebase'Junio C Hamano-28/+4
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano-0/+3
2011-03-25pull: do not clobber untracked files on initial pullJeff King-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano-2/+4
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann-0/+3
2011-02-21pull: propagate --progress to mergeJeff King-2/+4
2011-02-15pull: do not display fetch usage on --help-allMichael J Gruber-1/+1
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk-28/+4
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano-2/+8
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann-0/+3