Andrew's git - gitweb.git/history

[gitweb.git] / builtin / pull.c

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