Merge branch 'jk/long-error-messages'
[gitweb.git] / builtin / pull.c
2015-08-25 Merge branch 'jk/long-error-messages'
2015-08-25 Merge branch 'ee/clean-remove-dirs'
2015-08-25 Merge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19 Sync with maint
2015-08-19 Merge branch 'tb/complete-rebase-i-edit-todo'
2015-08-19 Merge branch 'jk/git-path'
2015-08-19 Merge branch 'jc/finalize-temp-file'
2015-08-19 Merge branch 'ps/guess-repo-name-at-root'
2015-08-19 Merge branch 'jk/guess-repo-name-regression-fix'
2015-08-19 Merge branch 'jk/negative-hiderefs'
2015-08-19 Merge branch 'jk/test-with-x'
2015-08-19 Merge branch 'ps/t1509-chroot-test-fixup'
2015-08-19 Merge branch 'sb/check-return-from-read-ref'
2015-08-19 Merge branch 'mm/pull-upload-pack'
2015-08-17 Merge branch 'dt/untracked-sparse'
2015-08-17 Merge branch 'ta/docfix-index-format-tech'
2015-08-17 Merge branch 'mh/get-remote-group-fix'
2015-08-17 Merge branch 'kd/pull-rebase-autostash'
2015-08-12 Merge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-12 Merge branch 'sb/parse-options-codeformat'
2015-08-12 Merge branch 'dt/unpack-trees-cache-tree-revalidate'
2015-08-12 Merge branch 'dt/reflog-tests'
2015-08-12 Merge branch 'es/worktree-add-cleanup'
2015-08-12 Merge branch 'es/worktree-add'
2015-08-12 Merge branch 'ad/bisect-cleanup'
2015-08-03 Sync with maint
2015-08-03 Merge branch 'es/doc-clean-outdated-tools'
2015-08-03 Merge branch 'jk/refspec-parse-wildcard'
2015-08-03 Merge branch 'da/subtree-date-confusion'
2015-08-03 Merge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03 Merge branch 'db/send-pack-user-signingkey'
2015-08-03 Merge branch 'zb/userdiff-fountain'
2015-08-03 Merge branch 'dt/refs-backend-preamble'
2015-08-03 Merge branch 'as/sparse-checkout-removal'
2015-08-03 Merge branch 'jk/date-mode-format'
2015-08-03 Merge branch 'pt/am-tests'
2015-08-03 Merge branch 'sg/bash-prompt-untracked-optim'
2015-08-03 Merge branch 'cb/uname-in-untracked'
2015-08-03 Merge branch 'se/doc-checkout-ours-theirs'
2015-08-03 Merge branch 'ib/scripted-parse-opt-better-hint-string'
2015-08-03 Merge branch 'mh/fast-import-optimize-current-from'
2015-08-03 Merge branch 'kn/tag-doc-fix'
2015-08-03 Merge branch 'mh/fast-import-get-mark'
2015-08-03 Merge branch 'gr/rebase-i-drop-warn'
2015-08-03 Merge branch 'jc/commit-slab'
2015-08-03 Merge branch 'dt/log-follow-config'
2015-08-03 Merge branch 'gp/status-rebase-i-info'
2015-08-03 Merge branch 'jk/cat-file-batch-all'
2015-08-03 Merge branch 'js/fsck-opt'
2015-08-03 Merge branch 'mh/init-delete-refs-api'
2015-08-03 Merge branch 'pt/pull-builtin'
2015-07-22 pull: allow dirty tree when rebase.autostash enabled
2015-06-18 pull: remove redirection to git-pull.sh
2015-06-18 pull --rebase: error on no merge candidate cases
2015-06-18 pull --rebase: exit early when the working directory...
2015-06-18 pull: configure --rebase via branch.<name>.rebase or...
2015-06-18 pull: teach git pull about --rebase
2015-06-18 pull: set reflog message
2015-06-18 pull: implement pulling into an unborn branch
2015-06-18 pull: fast-forward working tree if head is updated
2015-06-18 pull: check if in unresolved merge state
2015-06-18 pull: support pull.ff config
2015-06-18 pull: error on no merge candidates
2015-06-18 pull: pass git-fetch's options to git-fetch
2015-06-15 pull: pass git-merge's options to git-merge
2015-06-15 pull: pass verbosity, --progress flags to fetch and...
2015-06-15 pull: implement fetch + merge
2015-06-15 pull: implement skeletal builtin pull