summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
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-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
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
2010-11-12fetch/pull: Add the --recurse-submodules optionLibravatar Jens Lehmann1-2/+5
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageLibravatar Ramkumar Ramachandra1-4/+1
2010-08-21Merge branch 'en/rebase-against-rebase-fix'Libravatar Junio C Hamano1-0/+9
2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesLibravatar Elijah Newren1-0/+9
2010-05-25pull: do nothing on --dry-runLibravatar Jeff King1-1/+6
2010-03-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-03-20pull: replace unnecessary sed invocationLibravatar Stephen Boyd1-1/+1
2010-02-24fetch and pull: learn --progressLibravatar Tay Ray Chuan1-2/+4
2010-01-24pull: re-fix command line generationLibravatar Junio C Hamano1-1/+1
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-5/+25
2010-01-17pull: Fix parsing of -X<option>Libravatar Junio C Hamano1-7/+14
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun1-2/+15
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-2/+23
2009-12-08Merge branch 'maint'Libravatar Junio C Hamano1-15/+33
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationLibravatar Junio C Hamano1-3/+3
2009-12-03pull: clarify advice for the unconfigured error caseLibravatar Jan Krüger1-15/+33
2009-12-02git-pull.sh: Fix call to git-merge for new command formatLibravatar Horst H. von Brand1-3/+3
2009-11-15Merge branch 'fc/doc-fast-forward'Libravatar Junio C Hamano1-1/+1
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyLibravatar Björn Gustavsson1-2/+5
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
2009-10-09pull: improve advice for unconfigured error caseLibravatar Jeff King1-4/+12
2009-10-05git-pull: dead code removalLibravatar Junio C Hamano1-8/+1
2009-09-22pull: Clarify "helpful" message for another corner caseLibravatar Junio C Hamano1-1/+6
2009-08-12allow pull --rebase on branch yet to be bornLibravatar Jeff King1-5/+13
2009-07-19pull: support rebased upstream + fetch + pull --rebaseLibravatar Santi Béjar1-3/+11
2009-06-20Merge branch 'sb/pull-rebase'Libravatar Junio C Hamano1-5/+2
2009-06-14pull, rebase: simplify to use die()Libravatar Stephen Boyd1-4/+2
2009-06-11parse-remote: function to get the tracking branch to be mergeLibravatar Santi Béjar1-5/+2
2009-04-22Convert to use quiet option when availableLibravatar Dan Loewenherz1-1/+1
2009-04-08Merge branch 'maint'Libravatar Junio C Hamano1-17/+25
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Libravatar Matthieu Moy1-17/+25
2009-03-02git-pull: Allow --stat and --no-stat to be used with --rebaseLibravatar Tor Arne Vestbø1-5/+5
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseLibravatar Jay Soffian1-0/+5
2008-12-03pull: use git rev-parse -qLibravatar Miklos Vajna1-4/+4
2008-11-18Retain multiple -q/-v occurrences in git pullLibravatar Tuncer Ayaz1-2/+2
2008-11-14Teach/Fix pull/fetch -q/-v optionsLibravatar Tuncer Ayaz1-3/+7
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchLibravatar Junio C Hamano1-2/+2
2008-07-23Ignore dirty submodule states in "git pull --rebase"Libravatar Johannes Schindelin1-3/+3
2008-07-13Make usage strings dash-lessLibravatar Stephan Beyer1-1/+1
2008-05-22pull --rebase: exit early when the working directory is dirtyLibravatar Johannes Schindelin1-0/+5
2008-04-12merge, pull: add '--(no-)log' command line optionLibravatar SZEDER Gábor1-3/+5
2008-04-12merge, pull: introduce '--(no-)stat' optionLibravatar SZEDER Gábor1-9/+7
2008-02-22pull: pass --strategy along to to rebaseLibravatar Jay Soffian1-1/+2
2008-01-26pull --rebase: be cleverer with rebased upstream branchesLibravatar Johannes Schindelin1-1/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 17:52:24 +0000