aboutsummaryrefslogtreecommitdiffstats
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2014-02-27Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano1-1/+12
2014-02-27Merge branch 'da/pull-ff-configuration'Junio C Hamano1-1/+16
2014-02-11pull: add the --gpg-sign option.brian m. carlson1-1/+12
2014-01-17Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano1-1/+1
2014-01-17pull: suppress error when no remoteref is foundJohn Keeping1-1/+1
2014-01-15pull: add --ff-only to the help textDavid Aguilar1-1/+1
2014-01-15pull: add pull.ff configurationDavid Aguilar1-0/+15
2013-12-27Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano1-9/+1
2013-12-09pull: use merge-base --fork-point when appropriateJohn Keeping1-9/+1
2013-10-30fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty1-1/+1
2013-09-17Merge branch 'fc/trivial'Junio C Hamano1-3/+2
2013-09-08pull: use $curr_branch_short moreRené Scharfe1-3/+2
2013-09-04pull: allow pull to preserve merges when rebasingStephen Haberman1-5/+26
2013-07-12Merge branch 'jk/pull-to-integrate'Junio C Hamano1-1/+1
2013-07-08pull: change the description to "integrate" changesJohn Keeping1-1/+1
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano1-2/+9
2013-06-20pull: merge into unborn by fast-forwarding from empty treeThomas Rast1-1/+8
2013-06-20pull: update unborn branch tip after indexJeff King1-2/+2
2013-03-31merge/pull: verify GPG signatures of commits being mergedSebastian Götte1-2/+8
2013-03-16pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut1-1/+1
2012-10-25git-pull: Avoid merge-base on detached headPhil Hord1-0/+1
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto1-1/+1
2012-02-12"git pull" doesn't know "--edit"Linus Torvalds1-2/+6
2011-12-09Merge branch 'ab/pull-rebase-config'Junio C Hamano1-0/+4
2011-11-07pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason1-0/+4
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano1-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King1-1/+1
2011-10-05use -h for synopsis and --help for manpage consistentlyClemens Buchacher1-1/+1
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano1-5/+2
2011-08-08Merge branch 'oa/pull-reflog'Junio C Hamano1-1/+1
2011-08-08pull: take advantage of eval_gettextlnJon Seymour1-5/+2
2011-08-01pull: remove extra space from reflog messageOri Avtalion1-1/+1
2011-05-21i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason1-3/+6
2011-05-21i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-pull die messagesÆvar Arnfjörð Bjarmason1-9/+9
2011-05-21i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason1-0/+1
2011-04-28Merge branch 'mz/rebase'Junio C Hamano1-28/+4
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano1-0/+3
2011-03-25pull: do not clobber untracked files on initial pullJeff King1-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano1-2/+4
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann1-0/+3
2011-02-21pull: propagate --progress to mergeJeff King1-2/+4
2011-02-15pull: do not display fetch usage on --help-allMichael J Gruber1-1/+1
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk1-28/+4
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano1-2/+8
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann1-0/+3
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann1-2/+5
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra1-4/+1
2010-08-21Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano1-0/+9
2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren1-0/+9
2010-05-25pull: do nothing on --dry-runJeff King1-1/+6
2010-03-20Merge branch 'maint'Junio C Hamano1-1/+1
2010-03-20pull: replace unnecessary sed invocationStephen Boyd1-1/+1
2010-02-24fetch and pull: learn --progressTay Ray Chuan1-2/+4
2010-01-24pull: re-fix command line generationJunio C Hamano1-1/+1
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-5/+25
2010-01-17pull: Fix parsing of -X<option>Junio C Hamano1-7/+14
2010-01-17Teach git-pull to pass -X<option> to git-mergeAvery Pennarun1-2/+15
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy1-2/+23
2009-12-08Merge branch 'maint'Junio C Hamano1-15/+33
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano1-3/+3
2009-12-03pull: clarify advice for the unconfigured error caseJan Krüger1-15/+33
2009-12-02git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand1-3/+3
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano1-1/+1
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson1-2/+5
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-1/+1
2009-10-09pull: improve advice for unconfigured error caseJeff King1-4/+12
2009-10-05git-pull: dead code removalJunio C Hamano1-8/+1
2009-09-22pull: Clarify "helpful" message for another corner caseJunio C Hamano1-1/+6
2009-08-12allow pull --rebase on branch yet to be bornJeff King1-5/+13
2009-07-19pull: support rebased upstream + fetch + pull --rebaseSanti Béjar1-3/+11
2009-06-20Merge branch 'sb/pull-rebase'Junio C Hamano1-5/+2
2009-06-14pull, rebase: simplify to use die()Stephen Boyd1-4/+2
2009-06-11parse-remote: function to get the tracking branch to be mergeSanti Béjar1-5/+2
2009-04-22Convert to use quiet option when availableDan Loewenherz1-1/+1
2009-04-08Merge branch 'maint'Junio C Hamano1-17/+25
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy1-17/+25
2009-03-02git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø1-5/+5
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian1-0/+5
2008-12-03pull: use git rev-parse -qMiklos Vajna1-4/+4
2008-11-18Retain multiple -q/-v occurrences in git pullTuncer Ayaz1-2/+2
2008-11-14Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz1-3/+7
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano1-2/+2
2008-07-23Ignore dirty submodule states in "git pull --rebase"Johannes Schindelin1-3/+3
2008-07-13Make usage strings dash-lessStephan Beyer1-1/+1
2008-05-22pull --rebase: exit early when the working directory is dirtyJohannes Schindelin1-0/+5
2008-04-12merge, pull: add '--(no-)log' command line optionSZEDER Gábor1-3/+5
2008-04-12merge, pull: introduce '--(no-)stat' optionSZEDER Gábor1-9/+7
2008-02-22pull: pass --strategy along to to rebaseJay Soffian1-1/+2
2008-01-26pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin1-1/+11
2007-12-28"git pull --tags": error out with a better message.Junio C Hamano1-26/+40
2007-11-28Teach 'git pull' about --rebaseJohannes Schindelin1-1/+10
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano1-0/+1
2007-10-29Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli1-3/+11
2007-10-02Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero1-4/+18
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup1-3/+3
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-8/+8
2007-05-24Add a configuration option to control diffstat after mergeAlex Riesen1-0/+3
2007-01-15git-pull: disallow implicit merging to detached HEADJeff King1-2/+11
2007-01-12Allow whole-tree operations to be started from a subdirectoryJunio C Hamano1-1/+3
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce1-0/+1
2007-01-01fail pull/merge early in the middle of conflicted mergeJunio C Hamano1-0/+3
2006-12-28Allow git-merge to select the default strategy.Shawn O. Pearce1-18/+0
2006-12-28Ensure `git-pull` fails if `git-merge` fails.Shawn O. Pearce1-1/+1
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce1-3/+3
2006-12-19Move "no merge candidate" warning into git-pullJosef Weidendorfer1-0/+4
2006-11-16git-pull: allow pulling into an empty repositoryLinus Torvalds1-2/+14
2006-10-10git-pull: we say commit X, not X commit.Junio C Hamano1-1/+1
2006-07-11Log ref changes made by git-merge and git-pull.Shawn Pearce1-1/+2
2006-07-10Log ref changes made by git-fetch and git-pull.Shawn Pearce1-1/+1
2006-06-27Fix expr usage for FreeBSDDennis Stosberg1-1/+1
2006-06-24git-merge --squashJunio C Hamano1-2/+5
2006-06-24git-pull: abort when fmt-merge-msg fails.Junio C Hamano1-1/+1
2006-03-22git-pull: reword "impossible to fast-forward" message.Junio C Hamano1-1/+7
2006-03-22git-pull: further safety while on tracking branch.Junio C Hamano1-1/+3
2006-03-18git-pull: run repo-config with dash form.Junio C Hamano1-2/+2
2006-03-15Let merge set the default strategy.Mark Hollomon1-7/+3
2006-02-12Avoid using "git-var -l" until it gets fixed.Junio C Hamano1-4/+4
2005-12-14Trivial usage string clean-upfreku045@student.liu.se1-11/+2
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano1-1/+1
2005-11-09Make git-recursive the default strategy for git-pull.Junio C Hamano1-2/+14
2005-11-07Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano1-0/+0
2005-11-06Refactored merge options into separate merge-options.txt.Jon Loeliger1-1/+11
2005-11-04Document the --no-commit flag betterJunio C Hamano1-1/+1
2005-11-03Add --no-commit to git-merge/git-pull.Junio C Hamano1-2/+4
2005-10-03git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano1-1/+2
2005-09-29Use git-merge in git-pull (second try).Junio C Hamano1-4/+44
2005-09-28Use git-update-ref in scripts.Junio C Hamano1-3/+3
2005-09-28Fix default pull not to do an unintended Octopus.Junio C Hamano1-1/+3
2005-09-22Prettyprint octopus merge message.Junio C Hamano1-7/+2
2005-09-21Revert "Use git-merge instead of git-resolve in git-pull."Junio C Hamano1-33/+7
2005-09-21Revert "Make Octopus merge message a bit nicer."Junio C Hamano1-76/+5
2005-09-20Make Octopus merge message a bit nicer.Junio C Hamano1-5/+76
2005-09-20Use git-merge instead of git-resolve in git-pull.Junio C Hamano1-7/+33
2005-09-15Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano1-1/+1
2005-09-13Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano1-3/+5
2005-09-07Big tool rename.Junio C Hamano1-0/+44
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-17 22:15:44 +0000