path: root/
AgeCommit message (Expand)Author
2015-06-18pull: remove redirection to git-pull.shPaul Tan
2015-05-26Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano
2015-05-26Merge branch 'pt/pull-log-n'Junio C Hamano
2015-05-22Merge branch 'pt/pull-tags-error-diag'Junio C Hamano
2015-05-19Merge branch 'jc/merge'Junio C Hamano
2015-05-18pull: parse pull.ff as a bool or stringPaul Tan
2015-05-18pull: make pull.ff=true override merge.ffPaul Tan
2015-05-18pull: handle --log=<n>Paul Tan
2015-05-14pull: remove --tags error in no merge candidates casePaul Tan
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2014-12-01*.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy
2014-08-28merge, pull: stop advising 'commit -a' in case of conflictMatthieu Moy
2014-06-12Sync with maintJunio C Hamano
2014-06-12pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny use the $( ... ) construct for command substitutionElia Pinto
2014-02-27Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano
2014-02-27Merge branch 'da/pull-ff-configuration'Junio C Hamano
2014-02-11pull: add the --gpg-sign option.brian m. carlson
2014-01-17Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano
2014-01-17pull: suppress error when no remoteref is foundJohn Keeping
2014-01-16pull: add --ff-only to the help textDavid Aguilar
2014-01-16pull: add pull.ff configurationDavid Aguilar
2013-12-27Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano
2013-12-09pull: use merge-base --fork-point when appropriateJohn Keeping
2013-10-30fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty
2013-09-17Merge branch 'fc/trivial'Junio C Hamano
2013-09-08pull: use $curr_branch_short moreRené Scharfe
2013-09-04pull: allow pull to preserve merges when rebasingStephen Haberman
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