]> git.ipfire.org Git - thirdparty/git.git/history - ll-merge.c
(short) documentation for the testgit remote helper
[thirdparty/git.git] / ll-merge.c
2011-08-29  Junio C HamanoMerge branch 'nd/decorate-grafts'
2011-08-29  Junio C HamanoMerge branch 'nd/maint-clone-gitdir'
2011-08-29  Junio C HamanoMerge branch 'ci/forbid-unwanted-current-branch-update'
2011-08-29  Junio C HamanoMerge branch 'jk/pager-with-external-command'
2011-08-29  Junio C HamanoMerge branch 'jc/maint-clone-alternates'
2011-08-29  Junio C HamanoMerge branch 'jk/color-and-pager'
2011-08-29  Junio C HamanoMerge branch 'mh/attr'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-tagging'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-blob-tweak'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-deltified-tree'
2011-08-29  Junio C HamanoMerge branch 'di/fast-import-ident'
2011-08-29  Junio C HamanoMerge branch 'bw/doc-repo-layout'
2011-08-29  Junio C HamanoMerge branch 'va/p4-branch-import'
2011-08-29  Junio C HamanoMerge branch 'jc/combine-diff-callback'
2011-08-29  Junio C HamanoMerge branch 'nk/branch-v-abbrev'
2011-08-25  Junio C HamanoMerge branch 'jc/merge-reword'
2011-08-25  Junio C HamanoMerge branch 'mg/branch-set-upstream-previous'
2011-08-25  Junio C HamanoMerge branch 'jc/maint-autofix-tag-in-head'
2011-08-25  Junio C HamanoMerge branch 'di/fast-import-doc'
2011-08-25  Junio C HamanoMerge branch 'jn/plug-empty-tree-leak'
2011-08-25  Junio C HamanoMerge branch 'ac/describe-dirty-refresh'
2011-08-25  Junio C HamanoMerge branch 'di/parse-options-split'
2011-08-25  Junio C HamanoMerge branch 'js/i18n-scripts'
2011-08-25  Junio C HamanoMerge branch 'maint'
2011-08-24  Junio C HamanoSync with 1.7.6.1
2011-08-23  Junio C HamanoMerge branch 'rt/zlib-smaller-window'
2011-08-23  Junio C HamanoMerge branch 'jn/maint-test-return'
2011-08-23  Junio C HamanoMerge branch 'cb/maint-ls-files-error-report'
2011-08-23  Junio C HamanoMerge branch 'maint'
2011-08-23  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-23  Junio C HamanoMerge branch 'maint'
2011-08-19  Junio C HamanoMerge branch 'db/am-skip-blank-at-the-beginning'
2011-08-19  Junio C HamanoMerge branch 'ma/am-exclude'
2011-08-19  Junio C HamanoMerge branch 'maint'
2011-08-18  Junio C HamanoMerge branch 'mh/check-attr-relative'
2011-08-18  Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree'
2011-08-16  Junio C HamanoMerge branch 'jk/fast-export-quote-path' into maint
2011-08-16  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16  Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint
2011-08-16  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-11  Junio C HamanoMerge branch 'jk/fast-export-quote-path'
2011-08-04  Michael HaggertyRename git_checkattr() to git_check_attr()
2011-08-01  Junio C HamanoMerge branch 'jc/legacy-loose-object' into maint
2011-08-01  Junio C HamanoMerge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-22  Junio C HamanoMerge branch 'jk/tag-contains-ab'
2011-07-22  Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc'
2011-07-22  Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd'
2011-07-19  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-07-19  Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-13  Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13  Junio C HamanoMerge branch 'jc/legacy-loose-object'
2011-07-06  Junio C HamanoMerge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06  Junio C HamanoMerge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-07-06  Junio C HamanoMerge commit 'v1.6.0' into jc/checkout-reflog-fix
2011-06-30  Junio C HamanoMerge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30  Junio C HamanoMerge branch 'jk/maint-1.7.2-status-ignored'
2011-06-06  Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-06-06  Junio C HamanoMerge branch 'jk/diff-not-so-quick'
2011-06-06  Junio C HamanoMerge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01  Junio C HamanoMerge branch 'jk/maint-config-alias-fix' into maint
2011-05-31  Junio C HamanoMerge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-31  Junio C HamanoMerge branch 'jk/maint-config-alias-fix'
2011-05-26  Junio C HamanoMerge branch 'rg/no-gecos-in-pwent'
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26  Junio C HamanoMerge branch 'rg/copy-gecos-username' into maint
2011-05-26  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-23  Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe'
2011-05-20  Junio C HamanoMerge branch 'rg/copy-gecos-username'
2011-05-20  Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix'
2011-05-20  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-17  Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-16  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged' into maint
2011-05-16  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-13  Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13  Junio C HamanoMerge branch 'jc/fix-add-u-unmerged'
2011-05-13  Junio C HamanoMerge branch 'jk/merge-one-file-working-tree' into...
2011-05-13  Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged' into maint
2011-05-13  Junio C HamanoMerge branch 'mz/maint-rename-unmerged' into maint
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions'
2011-05-06  Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into mg...
2011-05-06  Junio C HamanoMerge branch 'im/hashcmp-optim'
2011-05-06  Junio C HamanoMerge branch 'jk/merge-one-file-working-tree'
2011-05-06  Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged'
2011-05-05  Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-04  Junio C HamanoMerge branch 'sp/maint-clear-postfields' into maint
2011-05-02  Junio C HamanoMerge branch 'mz/maint-rename-unmerged'
2011-04-29  Junio C HamanoMerge branch 'mg/x-years-12-months' into maint
2011-04-28  Junio C HamanoMerge branch 'en/merge-recursive'
2011-04-28  Junio C HamanoMerge branch 'sp/maint-clear-postfields'
2011-04-27  Junio C HamanoMerge branch 'mg/x-years-12-months'
2011-04-27  Junio C HamanoMerge branch 'ef/maint-strbuf-init'
2011-04-25  Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
next