index
:
git.git
main
maint
master
next
seen
todo
The core git plumbing
Junio C. Hamano
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
git-pull.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2015-06-18
pull: remove redirection to git-pull.sh
Paul Tan
1
-333
/
+0
2015-05-26
Merge branch 'pt/pull-ff-vs-merge-ff'
Junio C Hamano
1
-1
/
+4
2015-05-26
Merge branch 'pt/pull-log-n'
Junio C Hamano
1
-2
/
+2
2015-05-22
Merge branch 'pt/pull-tags-error-diag'
Junio C Hamano
1
-9
/
+0
2015-05-19
Merge branch 'jc/merge'
Junio C Hamano
1
-2
/
+1
2015-05-18
pull: parse pull.ff as a bool or string
Paul Tan
1
-1
/
+1
2015-05-18
pull: make pull.ff=true override merge.ff
Paul Tan
1
-0
/
+3
2015-05-18
pull: handle --log=<n>
Paul Tan
1
-2
/
+2
2015-05-14
pull: remove --tags error in no merge candidates case
Paul Tan
1
-9
/
+0
2015-04-29
merge: deprecate 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
1
-2
/
+1
2014-12-01
*.sh: respect $GIT_INDEX_FILE
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2014-08-28
merge, pull: stop advising 'commit -a' in case of conflict
Matthieu Moy
1
-1
/
+1
2014-06-12
Sync with maint
Junio C Hamano
1
-2
/
+0
2014-06-12
pull: do not abuse 'break' inside a shell 'case'
Jacek Konieczny
1
-2
/
+0
2014-04-23
git-pull.sh: use the $( ... ) construct for command substitution
Elia Pinto
1
-1
/
+1
2014-02-27
Merge branch 'bc/gpg-sign-everywhere'
Junio C Hamano
1
-1
/
+12
2014-02-27
Merge branch 'da/pull-ff-configuration'
Junio C Hamano
1
-1
/
+16
2014-02-11
pull: add the --gpg-sign option.
brian m. carlson
1
-1
/
+12
2014-01-17
Merge branch 'jk/pull-rebase-using-fork-point'
Junio C Hamano
1
-1
/
+1
2014-01-17
pull: suppress error when no remoteref is found
John Keeping
1
-1
/
+1
2014-01-15
pull: add --ff-only to the help text
David Aguilar
1
-1
/
+1
2014-01-15
pull: add pull.ff configuration
David Aguilar
1
-0
/
+15
2013-12-27
Merge branch 'jk/pull-rebase-using-fork-point'
Junio C Hamano
1
-9
/
+1
2013-12-09
pull: use merge-base --fork-point when appropriate
John Keeping
1
-9
/
+1
2013-10-30
fetch --tags: fetch tags *in addition to* other stuff
Michael Haggerty
1
-1
/
+1
2013-09-17
Merge branch 'fc/trivial'
Junio C Hamano
1
-3
/
+2
2013-09-08
pull: use $curr_branch_short more
René Scharfe
1
-3
/
+2
2013-09-04
pull: allow pull to preserve merges when rebasing
Stephen Haberman
1
-5
/
+26
2013-07-12
Merge branch 'jk/pull-to-integrate'
Junio C Hamano
1
-1
/
+1
2013-07-08
pull: change the description to "integrate" changes
John Keeping
1
-1
/
+1
2013-06-27
Merge branch 'jk/pull-into-dirty-unborn'
Junio C Hamano
1
-2
/
+9
2013-06-20
pull: merge into unborn by fast-forwarding from empty tree
Thomas Rast
1
-1
/
+8
2013-06-20
pull: update unborn branch tip after index
Jeff King
1
-2
/
+2
2013-03-31
merge/pull: verify GPG signatures of commits being merged
Sebastian Götte
1
-2
/
+8
2013-03-16
pull: Apply -q and -v options to rebase mode as well
Peter Eisentraut
1
-1
/
+1
2012-10-25
git-pull: Avoid merge-base on detached head
Phil Hord
1
-0
/
+1
2012-03-04
Make git-{pull,rebase} message without tracking information friendlier
Carlos Martín Nieto
1
-1
/
+1
2012-02-12
"git pull" doesn't know "--edit"
Linus Torvalds
1
-2
/
+6
2011-12-09
Merge branch 'ab/pull-rebase-config'
Junio C Hamano
1
-0
/
+4
2011-11-07
pull: introduce a pull.rebase option to enable --rebase
Ævar Arnfjörð Bjarmason
1
-0
/
+4
2011-10-17
Merge branch 'jk/pull-rebase-with-work-tree'
Junio C Hamano
1
-1
/
+1
2011-10-13
pull,rebase: handle GIT_WORK_TREE better
Jeff King
1
-1
/
+1
2011-10-05
use -h for synopsis and --help for manpage consistently
Clemens Buchacher
1
-1
/
+1
2011-08-25
Merge branch 'js/i18n-scripts'
Junio C Hamano
1
-5
/
+2
2011-08-08
Merge branch 'oa/pull-reflog'
Junio C Hamano
1
-1
/
+1
2011-08-08
pull: take advantage of eval_gettextln
Jon Seymour
1
-5
/
+2
2011-08-01
pull: remove extra space from reflog message
Ori Avtalion
1
-1
/
+1
2011-05-21
i18n: git-pull eval_gettext + warning message
Ævar Arnfjörð Bjarmason
1
-3
/
+6
2011-05-21
i18n: git-pull eval_gettext + die message
Ævar Arnfjörð Bjarmason
1
-3
/
+3
2011-05-21
i18n: git-pull die messages
Ævar Arnfjörð Bjarmason
1
-9
/
+9
2011-05-21
i18n: git-pull add git-sh-i18n
Ævar Arnfjörð Bjarmason
1
-0
/
+1
2011-04-28
Merge branch 'mz/rebase'
Junio C Hamano
1
-28
/
+4
2011-04-04
Merge branch 'jl/submodule-fetch-on-demand'
Junio C Hamano
1
-0
/
+3
2011-03-25
pull: do not clobber untracked files on initial pull
Jeff King
1
-1
/
+1
2011-03-19
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
1
-2
/
+4
2011-03-09
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
Jens Lehmann
1
-0
/
+3
2011-02-21
pull: propagate --progress to merge
Jeff King
1
-2
/
+4
2011-02-15
pull: do not display fetch usage on --help-all
Michael J Gruber
1
-1
/
+1
2011-02-10
rebase: use @{upstream} if no upstream specified
Martin von Zweigbergk
1
-28
/
+4
2010-12-16
Merge branch 'jl/fetch-submodule-recursive'
Junio C Hamano
1
-2
/
+8
2010-11-12
Add the 'fetch.recurseSubmodules' config setting
Jens Lehmann
1
-0
/
+3
2010-11-12
fetch/pull: Add the --recurse-submodules option
Jens Lehmann
1
-2
/
+5
2010-10-28
Porcelain scripts: Rewrite cryptic "needs update" error message
Ramkumar Ramachandra
1
-4
/
+1
2010-08-21
Merge branch 'en/rebase-against-rebase-fix'
Junio C Hamano
1
-0
/
+9
2010-08-12
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
Elijah Newren
1
-0
/
+9
2010-05-25
pull: do nothing on --dry-run
Jeff King
1
-1
/
+6
2010-03-20
Merge branch 'maint'
Junio C Hamano
1
-1
/
+1
2010-03-20
pull: replace unnecessary sed invocation
Stephen Boyd
1
-1
/
+1
2010-02-24
fetch and pull: learn --progress
Tay Ray Chuan
1
-2
/
+4
2010-01-24
pull: re-fix command line generation
Junio C Hamano
1
-1
/
+1
2010-01-20
Merge branch 'ap/merge-backend-opts'
Junio C Hamano
1
-5
/
+25
2010-01-17
pull: Fix parsing of -X<option>
Junio C Hamano
1
-7
/
+14
2010-01-17
Teach git-pull to pass -X<option> to git-merge
Avery Pennarun
1
-2
/
+15
2010-01-12
Be more user-friendly when refusing to do something because of conflict.
Matthieu Moy
1
-2
/
+23
2009-12-08
Merge branch 'maint'
Junio C Hamano
1
-15
/
+33
2009-12-08
Revert recent "git merge <msg> HEAD <commit>..." deprecation
Junio C Hamano
1
-3
/
+3
2009-12-03
pull: clarify advice for the unconfigured error case
Jan Krüger
1
-15
/
+33
2009-12-02
git-pull.sh: Fix call to git-merge for new command format
Horst H. von Brand
1
-3
/
+3
2009-11-15
Merge branch 'fc/doc-fast-forward'
Junio C Hamano
1
-1
/
+1
2009-10-30
Teach 'git merge' and 'git pull' the option --ff-only
Björn Gustavsson
1
-2
/
+5
2009-10-24
Use 'fast-forward' all over the place
Felipe Contreras
1
-1
/
+1
2009-10-09
pull: improve advice for unconfigured error case
Jeff King
1
-4
/
+12
2009-10-05
git-pull: dead code removal
Junio C Hamano
1
-8
/
+1
2009-09-22
pull: Clarify "helpful" message for another corner case
v1.6.5-rc2
Junio C Hamano
1
-1
/
+6
2009-08-12
allow pull --rebase on branch yet to be born
Jeff King
1
-5
/
+13
2009-07-19
pull: support rebased upstream + fetch + pull --rebase
Santi Béjar
1
-3
/
+11
2009-06-20
Merge branch 'sb/pull-rebase'
Junio C Hamano
1
-5
/
+2
2009-06-14
pull, rebase: simplify to use die()
Stephen Boyd
1
-4
/
+2
2009-06-11
parse-remote: function to get the tracking branch to be merge
Santi Béjar
1
-5
/
+2
2009-04-22
Convert to use quiet option when available
Dan Loewenherz
1
-1
/
+1
2009-04-08
Merge branch 'maint'
Junio C Hamano
1
-17
/
+25
2009-04-08
git-pull.sh: better warning message for "git pull" on detached head.
Matthieu Moy
1
-17
/
+25
2009-03-02
git-pull: Allow --stat and --no-stat to be used with --rebase
Tor Arne Vestbø
1
-5
/
+5
2009-02-18
disallow providing multiple upstream branches to rebase, pull --rebase
Jay Soffian
1
-0
/
+5
2008-12-03
pull: use git rev-parse -q
Miklos Vajna
1
-4
/
+4
2008-11-18
Retain multiple -q/-v occurrences in git pull
Tuncer Ayaz
1
-2
/
+2
2008-11-14
Teach/Fix pull/fetch -q/-v options
Tuncer Ayaz
1
-3
/
+7
2008-10-17
pull: allow "git pull origin $something:$current_branch" into an unborn branch
Junio C Hamano
1
-2
/
+2
2008-07-23
Ignore dirty submodule states in "git pull --rebase"
Johannes Schindelin
1
-3
/
+3
2008-07-13
Make usage strings dash-less
Stephan Beyer
1
-1
/
+1
2008-05-22
pull --rebase: exit early when the working directory is dirty
Johannes Schindelin
1
-0
/
+5
2008-04-12
merge, pull: add '--(no-)log' command line option
SZEDER Gábor
1
-3
/
+5
2008-04-12
merge, pull: introduce '--(no-)stat' option
SZEDER Gábor
1
-9
/
+7
2008-02-22
pull: pass --strategy along to to rebase
Jay Soffian
1
-1
/
+2
2008-01-26
pull --rebase: be cleverer with rebased upstream branches
Johannes Schindelin
1
-1
/
+11
2007-12-28
"git pull --tags": error out with a better message.
Junio C Hamano
1
-26
/
+40
2007-11-28
Teach 'git pull' about --rebase
Johannes Schindelin
1
-1
/
+10
2007-11-06
scripts: Add placeholders for OPTIONS_SPEC
Junio C Hamano
1
-0
/
+1
2007-10-29
Teach git-pull about --[no-]ff, --no-squash and --commit
Lars Hjemli
1
-3
/
+11
2007-10-02
Make git-pull complain and give advice when there is nothing to merge with
Federico Mena Quintero
1
-4
/
+18
2007-09-23
Supplant the "while case ... break ;; esac" idiom
David Kastrup
1
-3
/
+3
2007-07-02
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
1
-8
/
+8
2007-05-24
Add a configuration option to control diffstat after merge
Alex Riesen
1
-0
/
+3
2007-01-15
git-pull: disallow implicit merging to detached HEAD
Jeff King
1
-2
/
+11
2007-01-12
Allow whole-tree operations to be started from a subdirectory
Junio C Hamano
1
-1
/
+3
2007-01-10
Disallow working directory commands in a bare repository.
Shawn O. Pearce
1
-0
/
+1
2007-01-01
fail pull/merge early in the middle of conflicted merge
Junio C Hamano
1
-0
/
+3
2006-12-28
Allow git-merge to select the default strategy.
Shawn O. Pearce
1
-18
/
+0
2006-12-28
Ensure `git-pull` fails if `git-merge` fails.
Shawn O. Pearce
1
-1
/
+1
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
1
-3
/
+3
2006-12-19
Move "no merge candidate" warning into git-pull
Josef Weidendorfer
1
-0
/
+4
2006-11-16
git-pull: allow pulling into an empty repository
Linus Torvalds
1
-2
/
+14
2006-10-10
git-pull: we say commit X, not X commit.
Junio C Hamano
1
-1
/
+1
2006-07-11
Log ref changes made by git-merge and git-pull.
Shawn Pearce
1
-1
/
+2
2006-07-10
Log ref changes made by git-fetch and git-pull.
Shawn Pearce
1
-1
/
+1
2006-06-27
Fix expr usage for FreeBSD
Dennis Stosberg
1
-1
/
+1
2006-06-24
git-merge --squash
Junio C Hamano
1
-2
/
+5
2006-06-24
git-pull: abort when fmt-merge-msg fails.
Junio C Hamano
1
-1
/
+1
2006-03-22
git-pull: reword "impossible to fast-forward" message.
Junio C Hamano
1
-1
/
+7
2006-03-22
git-pull: further safety while on tracking branch.
Junio C Hamano
1
-1
/
+3
2006-03-18
git-pull: run repo-config with dash form.
Junio C Hamano
1
-2
/
+2
2006-03-15
Let merge set the default strategy.
Mark Hollomon
1
-7
/
+3
2006-02-12
Avoid using "git-var -l" until it gets fixed.
Junio C Hamano
1
-4
/
+4
2005-12-14
Trivial usage string clean-up
freku045@student.liu.se
1
-11
/
+2
2005-11-25
git-sh-setup: die if outside git repository.
Junio C Hamano
1
-1
/
+1
2005-11-09
Make git-recursive the default strategy for git-pull.
Junio C Hamano
1
-2
/
+14
2005-11-07
Recover dropped +x bit from git-pull.sh by accident.
Junio C Hamano
1
-0
/
+0
2005-11-06
Refactored merge options into separate merge-options.txt.
Jon Loeliger
1
-1
/
+11
2005-11-04
Document the --no-commit flag better
Junio C Hamano
1
-1
/
+1
2005-11-03
Add --no-commit to git-merge/git-pull.
Junio C Hamano
1
-2
/
+4
2005-10-03
git-pull: do not barf on -a flag meant for git-fetch.
Junio C Hamano
1
-1
/
+2
2005-09-29
Use git-merge in git-pull (second try).
Junio C Hamano
1
-4
/
+44
2005-09-28
Use git-update-ref in scripts.
Junio C Hamano
1
-3
/
+3
2005-09-28
Fix default pull not to do an unintended Octopus.
Junio C Hamano
1
-1
/
+3
2005-09-22
Prettyprint octopus merge message.
Junio C Hamano
1
-7
/
+2
2005-09-21
Revert "Use git-merge instead of git-resolve in git-pull."
Junio C Hamano
1
-33
/
+7
2005-09-21
Revert "Make Octopus merge message a bit nicer."
Junio C Hamano
1
-76
/
+5
2005-09-20
Make Octopus merge message a bit nicer.
Junio C Hamano
1
-5
/
+76
2005-09-20
Use git-merge instead of git-resolve in git-pull.
Junio C Hamano
1
-7
/
+33
2005-09-15
Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
Junio C Hamano
1
-1
/
+1
2005-09-13
Make merge comment git-pull makes for an octopus a bit prettier.
Junio C Hamano
1
-3
/
+5
2005-09-07
Big tool rename.
Junio C Hamano
1
-0
/
+44