git.oblomov.eu Git - git/history - git-merge-one-file.sh

2017-09-22	Junio C Hamano	Sync with 2.13.6	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jt/doc-pack-objects-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jn/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'bc/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/doc-the-this' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/commit-h-single-parent-cleanup' into...	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'mg/format-ref-doc-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/submodule-parallel-update' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'hv/t5526-andand-chain-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/sha1-file-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'ah/doc-empty-string-is-false' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/merge-microcleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/find-pack-entry-bisection' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/apply-lose-prefix-length' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rj/add-chmod-error-message' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/hashcmp-memcmp' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t3700-clean-leftover' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jc/perl-git-comment-typofix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'mf/no-dashed-subcommands' into maint	blob \| commitdiff \| raw
2017-08-07	Michael Forney	scripts: use "git foo" not "git-foo"	blob \| commitdiff \| raw
2017-07-25	Junio C Hamano	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2017-06-24	Junio C Hamano	Merge branch 'jc/diff-tree-stale-comment' into maint	blob \| commitdiff \| raw \| diff to current
2017-06-24	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| commitdiff \| raw \| diff to current
2017-06-13	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety'	blob \| commitdiff \| raw \| diff to current
2017-06-13	Junio C Hamano	Merge branch 'jc/diff-tree-stale-comment'	blob \| commitdiff \| raw \| diff to current
2017-06-05	Junio C Hamano	Merge branch 'sg/core-filemode-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2017-05-29	Junio C Hamano	Merge branch 'sg/core-filemode-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2017-05-05	Junio C Hamano	Merge branch 'maint-2.6' into maint-2.7	blob \| commitdiff \| raw \| diff to current
2017-05-05	Junio C Hamano	Merge branch 'maint-2.5' into maint-2.6	blob \| commitdiff \| raw \| diff to current
2017-05-01	Junio C Hamano	Merge branch 'jk/prio-queue-avoid-swap-with-self'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/unused-symbols'	blob \| commitdiff \| raw \| diff to current
2017-04-11	Junio C Hamano	Merge branch 'cc/untracked'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'bc/push-cert-receive-fix'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'jc/merge-drop-old-syntax'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'rs/path-name-safety-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-24	Junio C Hamano	Merge branch 'rs/path-name-safety-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-03-21	Junio C Hamano	Merge branch 'jk/ewah-use-right-type-in-sizeof' into...	blob \| commitdiff \| raw \| diff to current
2017-03-13	Junio C Hamano	Merge branch 'jk/ewah-use-right-type-in-sizeof'	blob \| commitdiff \| raw \| diff to current
2017-02-24	Junio C Hamano	Merge branch 'bc/worktree-doc-fix-detached'	blob \| commitdiff \| raw \| diff to current
2017-02-10	Junio C Hamano	Merge branch 'ps/worktree-prune-help-fix'	blob \| commitdiff \| raw \| diff to current
2017-01-31	Junio C Hamano	Merge branch 'ad/bisect-terms' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-23	Junio C Hamano	Merge branch 'ad/bisect-terms'	blob \| commitdiff \| raw \| diff to current
2017-01-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'sb/t3600-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/pull-rebase-ff' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'bb/unicode-9.0' into maint	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'sb/t3600-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'jc/pull-rebase-ff'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'bb/unicode-9.0'	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/tighten-alloc' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/tighten-alloc'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jc/ws-error-highlight'	blob \| commitdiff \| raw \| diff to current
2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2016-10-11	Junio C Hamano	Merge branch 'jc/verify-loose-object-header' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-10	Junio C Hamano	Merge branch 'nd/shallow-deepen'	blob \| commitdiff \| raw \| diff to current
2016-10-03	Junio C Hamano	Merge branch 'jc/verify-loose-object-header'	blob \| commitdiff \| raw \| diff to current
2016-09-29	Junio C Hamano	Merge branch 'ls/travis-homebrew-path-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-29	Junio C Hamano	Merge branch 'jk/reduce-gc-aggressive-depth' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-29	Junio C Hamano	Merge branch 'ew/http-do-not-forget-to-call-curl-multi...	blob \| commitdiff \| raw \| diff to current
2016-09-29	Junio C Hamano	Merge branch 'mr/vcs-svn-printf-ulong' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'ls/travis-homebrew-path-fix'	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| commitdiff \| raw \| diff to current
2016-09-21	Junio C Hamano	Merge branch 'jk/reduce-gc-aggressive-depth'	blob \| commitdiff \| raw \| diff to current
2016-09-21	Junio C Hamano	Merge branch 'mr/vcs-svn-printf-ulong'	blob \| commitdiff \| raw \| diff to current
2016-09-21	Junio C Hamano	Merge branch 'ew/http-do-not-forget-to-call-curl-multi...	blob \| commitdiff \| raw \| diff to current
2016-09-19	Junio C Hamano	Merge branch 'po/range-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-11	Junio C Hamano	Merge branch 'js/commit-gpgsign' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'po/range-doc'	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'rs/mailinfo-lib' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'jk/tighten-alloc' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'js/import-tars-hardlinks' into maint	blob \| commitdiff \| raw \| diff to current
2016-09-07	Junio C Hamano	Merge branch 'sy/i18n' of git-gui	blob \| commitdiff \| raw \| diff to current
2016-08-31	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix'	blob \| commitdiff \| raw \| diff to current
2016-08-17	Junio C Hamano	Merge branch 'rs/mailinfo-lib'	blob \| commitdiff \| raw \| diff to current
2016-08-17	Junio C Hamano	Merge branch 'jk/tighten-alloc'	blob \| commitdiff \| raw \| diff to current
2016-08-12	Junio C Hamano	Merge branch 'js/import-tars-hardlinks'	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'js/commit-slab-decl-fix'	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'cp/completion-clone-recurse-submodules...	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'jc/hashmap-doc-init' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'js/t4130-rename-without-ino' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'jc/grep-commandline-vs-configuration...	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'pm/build-persistent-https-with-recent...	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'os/no-verify-skips-commit-msg-too' into...	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'ew/autoconf-pthread' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-10	Junio C Hamano	Merge branch 'mm/status-suggest-merge-abort' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'jc/hashmap-doc-init'	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'jk/parseopt-string-list'	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'nd/log-decorate-color-head-arrow'	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'cp/completion-clone-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'js/t4130-rename-without-ino'	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'sb/pack-protocol-doc-nak' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'jc/doc-diff-filter-exclude' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'rs/use-strbuf-addbuf' into maint	blob \| commitdiff \| raw \| diff to current
2016-08-08	Junio C Hamano	Merge branch 'lf/recv-sideband-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom