Andrew's git - gitweb.git/history

[gitweb.git] / ll-merge.c

2015-08-03	Merge branch 'sg/bash-prompt-untracked-optim'	blob \| diff \| raw
2015-08-03	Merge branch 'cb/uname-in-untracked'	blob \| diff \| raw
2015-08-03	Merge branch 'se/doc-checkout-ours-theirs'	blob \| diff \| raw
2015-08-03	Merge branch 'kn/tag-doc-fix'	blob \| diff \| raw
2015-08-03	Merge branch 'mh/fast-import-get-mark'	blob \| diff \| raw
2015-08-03	Merge branch 'gr/rebase-i-drop-warn'	blob \| diff \| raw
2015-08-03	Merge branch 'jc/commit-slab'	blob \| diff \| raw
2015-08-03	Merge branch 'gp/status-rebase-i-info'	blob \| diff \| raw
2015-08-03	Merge branch 'jk/cat-file-batch-all'	blob \| diff \| raw
2015-08-03	Merge branch 'js/fsck-opt'	blob \| diff \| raw
2015-08-03	Merge branch 'mh/init-delete-refs-api'	blob \| diff \| raw
2015-08-03	Merge branch 'pt/pull-builtin'	blob \| diff \| raw
2015-08-03	Merge branch 'jk/pkt-log-pack'	blob \| diff \| raw
2015-08-03	Merge branch 'mr/rebase-i-customize-insn-sheet'	blob \| diff \| raw
2015-08-03	Merge branch 'rl/send-email-aliases'	blob \| diff \| raw
2015-08-03	Merge branch 'kb/i18n-doc'	blob \| diff \| raw
2015-08-03	Merge branch 'nd/export-worktree'	blob \| diff \| raw
2015-08-03	Merge branch 'ee/clean-remove-dirs'	blob \| diff \| raw
2015-08-03	Merge branch 'cb/parse-magnitude'	blob \| diff \| raw
2015-08-03	Merge branch 'bc/gpg-verify-raw'	blob \| diff \| raw
2015-08-03	Merge branch 'pt/am-foreign'	blob \| diff \| raw
2015-08-03	Merge branch 'kn/for-each-ref'	blob \| diff \| raw
2015-08-03	Merge branch 'mh/replace-refs'	blob \| diff \| raw
2015-07-27	Sync with 2.4.7	blob \| diff \| raw
2015-07-27	Merge branch 'jk/pretty-encoding-doc' into maint	blob \| diff \| raw \| diff to current
2015-07-27	Merge branch 'mm/branch-doc-updates' into maint	blob \| diff \| raw \| diff to current
2015-07-27	Merge branch 'jc/fsck-retire-require-eoh' into maint	blob \| diff \| raw \| diff to current
2015-07-27	Merge branch 'jk/rev-list-no-bitmap-while-pruning'...	blob \| diff \| raw \| diff to current
2015-07-27	Merge branch 'jk/index-pack-reduce-recheck' into maint	blob \| diff \| raw \| diff to current
2015-07-21	Merge branch 'tf/gitweb-typofix'	blob \| diff \| raw
2015-07-17	Merge branch 'jk/still-interesting'	blob \| diff \| raw
2015-07-17	Merge branch 'es/worktree-add'	blob \| diff \| raw
2015-07-15	Sync with 2.4.6	blob \| diff \| raw
2015-07-15	Merge branch 'jc/diff-ws-error-highlight'	blob \| diff \| raw
2015-07-15	Merge branch 'jc/prompt-document-ps1-state-separator...	blob \| diff \| raw \| diff to current
2015-07-15	Merge branch 'es/osx-header-pollutes-mask-macro' into...	blob \| diff \| raw \| diff to current
2015-07-15	Merge branch 'es/utf8-stupid-compiler-workaround' into...	blob \| diff \| raw \| diff to current
2015-07-15	Merge branch 'fk/doc-format-patch-vn' into maint	blob \| diff \| raw \| diff to current
2015-07-15	Merge branch 'me/fetch-into-shallow-safety' into maint	blob \| diff \| raw \| diff to current
2015-07-15	Merge branch 'af/tcsh-completion-noclobber' into maint	blob \| diff \| raw \| diff to current
2015-07-13	Merge branch 'es/worktree-add'	blob \| diff \| raw
2015-07-13	Merge branch 'nd/multiple-work-trees'	blob \| diff \| raw
2015-07-13	Merge branch 'ss/clone-guess-dir-name-simplify'	blob \| diff \| raw
2015-07-13	Merge branch 'kb/config-unmap-before-renaming'	blob \| diff \| raw
2015-07-13	Merge branch 'mh/strbuf-read-file-returns-ssize-t'	blob \| diff \| raw
2015-07-13	Merge branch 'jc/unexport-git-pager-in-use-in-pager'	blob \| diff \| raw
2015-07-13	Merge branch 'kb/use-nsec-doc'	blob \| diff \| raw
2015-07-13	Merge branch 'js/rebase-i-clean-up-upon-continue-to...	blob \| diff \| raw
2015-07-13	Merge branch 'et/http-proxyauth'	blob \| diff \| raw
2015-07-13	Merge branch 'jc/fsck-retire-require-eoh'	blob \| diff \| raw
2015-07-10	Merge branch 'cb/rebase-am-exit-code'	blob \| diff \| raw
2015-07-10	Merge branch 'jk/fix-refresh-utime'	blob \| diff \| raw
2015-07-10	Merge branch 'mm/branch-doc-updates'	blob \| diff \| raw
2015-07-10	Merge branch 'ls/hint-rev-list-count'	blob \| diff \| raw
2015-07-10	Merge branch 'jk/rev-list-no-bitmap-while-pruning'	blob \| diff \| raw
2015-07-10	Merge branch 'cb/subtree-tests-update'	blob \| diff \| raw
2015-07-10	Merge branch 'rh/test-color-avoid-terminfo-in-original...	blob \| diff \| raw
2015-07-10	Merge branch 'sb/p5310-and-chain'	blob \| diff \| raw
2015-07-10	Merge branch 'tb/checkout-doc'	blob \| diff \| raw
2015-07-10	Merge branch 'jk/pretty-encoding-doc'	blob \| diff \| raw
2015-07-10	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| diff \| raw
2015-07-09	Merge branch 'jk/maint-for-each-packed-object'	blob \| diff \| raw
2015-07-09	Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'	blob \| diff \| raw
2015-07-01	Merge branch 'me/fetch-into-shallow-safety'	blob \| diff \| raw
2015-07-01	Merge branch 'jc/prompt-document-ps1-state-separator'	blob \| diff \| raw
2015-07-01	Merge branch 'mm/describe-doc'	blob \| diff \| raw
2015-07-01	Merge branch 'da/mergetool-winmerge'	blob \| diff \| raw
2015-06-28	Sync with maint	blob \| diff \| raw
2015-06-25	Merge branch 'cn/cvsimport-perl-update'	blob \| diff \| raw
2015-06-25	Merge branch 'cb/array-size'	blob \| diff \| raw
2015-06-25	Sync with 2.4.5	blob \| diff \| raw
2015-06-25	Merge branch 'mm/rebase-i-post-rewrite-exec' into maint	blob \| diff \| raw \| diff to current
2015-06-25	Merge branch 'nd/diff-i-t-a'	blob \| diff \| raw
2015-06-24	Merge branch 'jk/stash-require-clean-index'	blob \| diff \| raw
2015-06-24	Merge branch 'pa/auto-gc-mac-osx'	blob \| diff \| raw
2015-06-24	Merge branch 'pt/t0302-needs-sanity'	blob \| diff \| raw
2015-06-24	Merge branch 'ld/p4-changes-block-size'	blob \| diff \| raw
2015-06-24	Merge branch 'fk/doc-format-patch-vn'	blob \| diff \| raw
2015-06-24	Merge branch 'sg/commit-cleanup-scissors'	blob \| diff \| raw
2015-06-24	Merge branch 'jk/index-pack-reduce-recheck'	blob \| diff \| raw
2015-06-24	Merge branch 'af/tcsh-completion-noclobber'	blob \| diff \| raw
2015-06-24	Merge branch 'mh/reporting-broken-refs-from-for-each...	blob \| diff \| raw
2015-06-24	Merge branch 'sg/completion-commit-cleanup'	blob \| diff \| raw
2015-06-24	Merge branch 'pt/am-abort-fix'	blob \| diff \| raw
2015-06-24	Merge branch 'nd/untracked-cache'	blob \| diff \| raw
2015-06-24	Merge branch 'mh/fsck-reflog-entries'	blob \| diff \| raw
2015-06-24	Merge branch 'js/sleep-without-select'	blob \| diff \| raw
2015-06-24	Merge branch 'es/utf8-stupid-compiler-workaround'	blob \| diff \| raw
2015-06-24	Merge branch 'rl/am-3way-config'	blob \| diff \| raw
2015-06-24	Merge branch 'jc/ll-merge-expose-path'	blob \| diff \| raw
2015-06-24	Merge branch 'es/osx-header-pollutes-mask-macro'	blob \| diff \| raw \| diff to current
2015-06-16	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| diff \| raw \| diff to current
2015-06-16	Merge branch 'dt/clean-pathspec-filter-then-lstat'...	blob \| diff \| raw \| diff to current
2015-06-16	Merge branch 'jh/filter-empty-contents' into maint	blob \| diff \| raw \| diff to current
2015-06-16	Merge branch 'mm/log-format-raw-doc' into maint	blob \| diff \| raw \| diff to current
2015-06-05	Merge branch 'jk/skip-http-tests-under-no-curl' into...	blob \| diff \| raw \| diff to current
2015-06-05	Merge branch 'jk/rerere-forget-check-enabled' into...	blob \| diff \| raw \| diff to current
2015-06-05	Merge branch 'ja/tutorial-asciidoctor-fix' into maint	blob \| diff \| raw \| diff to current
2015-06-05	Merge branch 'jk/stripspace-asciidoctor-fix' into maint	blob \| diff \| raw \| diff to current
2015-06-05	Merge branch 'ps/bundle-verify-arg' into maint	blob \| diff \| raw \| diff to current
next