summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2014-08-28merge, pull: stop advising 'commit -a' in case of conflictLibravatar Matthieu Moy1-1/+1
2014-06-12Sync with maintLibravatar Junio C Hamano1-2/+0
2014-06-12pull: do not abuse 'break' inside a shell 'case'Libravatar Jacek Konieczny1-2/+0
2014-04-23git-pull.sh: use the $( ... ) construct for command substitutionLibravatar Elia Pinto1-1/+1
2014-02-27Merge branch 'bc/gpg-sign-everywhere'Libravatar Junio C Hamano1-1/+12
2014-02-27Merge branch 'da/pull-ff-configuration'Libravatar Junio C Hamano1-1/+16
2014-02-11pull: add the --gpg-sign option.Libravatar brian m. carlson1-1/+12
2014-01-17Merge branch 'jk/pull-rebase-using-fork-point'Libravatar Junio C Hamano1-1/+1
2014-01-17pull: suppress error when no remoteref is foundLibravatar John Keeping1-1/+1
2014-01-15pull: add --ff-only to the help textLibravatar David Aguilar1-1/+1
2014-01-15pull: add pull.ff configurationLibravatar David Aguilar1-0/+15
2013-12-27Merge branch 'jk/pull-rebase-using-fork-point'Libravatar Junio C Hamano1-9/+1
2013-12-09pull: use merge-base --fork-point when appropriateLibravatar John Keeping1-9/+1
2013-10-30fetch --tags: fetch tags *in addition to* other stuffLibravatar Michael Haggerty1-1/+1
2013-09-17Merge branch 'fc/trivial'Libravatar Junio C Hamano1-3/+2
2013-09-08pull: use $curr_branch_short moreLibravatar René Scharfe1-3/+2
2013-09-04pull: allow pull to preserve merges when rebasingLibravatar Stephen Haberman1-5/+26
2013-07-12Merge branch 'jk/pull-to-integrate'Libravatar Junio C Hamano1-1/+1
2013-07-08pull: change the description to "integrate" changesLibravatar John Keeping1-1/+1
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