]> git.ipfire.org Git - thirdparty/git.git/history - string-list.h
Documentation/git-merge-file: document option "--diff3"
[thirdparty/git.git] / string-list.h
2013-07-22  Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22  Junio C HamanoMerge branch 'dk/maint-t5150-dirname' into maint
2013-07-22  Junio C HamanoMerge branch 'dk/version-gen-gitdir' into maint
2013-07-22  Junio C HamanoMerge branch 'nk/config-local-doc' into maint
2013-07-22  Junio C HamanoMerge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22  Junio C HamanoMerge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22  Junio C HamanoMerge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19  Junio C HamanoMerge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half...
2013-07-19  Junio C HamanoMerge branch 'jc/t1512-fix' into maint
2013-07-19  Junio C HamanoMerge branch 'mm/push-force-is-dangerous' into maint
2013-07-15  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15  Junio C HamanoMerge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-03  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03  Junio C HamanoMerge branch 'cb/log-follow-with-combined' into maint
2013-07-03  Junio C HamanoMerge branch 'maint-1.8.1' into maint-1.8.2
2013-06-27  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'...
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-09  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-07  Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
2013-05-01  Junio C HamanoMerge branch 'hb/git-pm-tempfile'
2013-04-28  Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
2013-04-26  Junio C HamanoMerge branch 'ph/rebase-original'
2013-04-26  Junio C HamanoMerge branch 'jk/a-thread-only-dies-once' into maint
2013-04-26  Junio C HamanoMerge branch 'jk/receive-pack-deadlocks-with-early...
2013-04-26  Junio C HamanoMerge branch 'rs/empty-archive' into maint
2013-04-26  Junio C HamanoMerge branch 'pe/pull-rebase-v-q' into maint
2013-04-24  Junio C HamanoMerge branch 'jk/diff-algo-finishing-touches' into...
2013-04-24  Junio C HamanoMerge branch 'sr/log-SG-no-textconv' into maint
2013-04-24  Junio C HamanoMerge branch 'jc/merge-tag-object' into maint
2013-04-23  Junio C HamanoMerge branch 'jk/receive-pack-deadlocks-with-early...
2013-04-22  Junio C HamanoMerge branch 'jk/daemon-user-doc' into maint
2013-04-22  Junio C HamanoMerge branch 'jc/detached-head-doc' into maint
2013-04-22  Junio C HamanoMerge branch 'jk/show-branch-strbuf' into maint
2013-04-22  Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL...
2013-04-22  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent' into maint
2013-04-22  Junio C HamanoMerge branch 'jk/suppress-clang-warning' into maint
2013-04-22  Junio C HamanoMerge branch 'lf/bundle-with-tip-wo-message' into maint
2013-04-22  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original...
2013-04-22  Junio C HamanoMerge branch 'rs/archive-zip-raw-compression'
2013-04-22  Junio C HamanoMerge branch 'lf/read-blob-data-from-index'
2013-04-19  Junio C HamanoMerge branch 'jk/a-thread-only-dies-once'
2013-04-19  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin'
2013-04-18  Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
2013-04-18  Junio C HamanoMerge branch 'rs/empty-archive'
2013-04-18  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple' (early...
2013-04-18  Junio C HamanoMerge branch 'jk/daemon-user-doc'
2013-04-18  Junio C HamanoMerge branch 'jc/detached-head-doc'
2013-04-15  Junio C HamanoMerge branch 'jk/diff-algo-finishing-touches'
2013-04-15  Junio C HamanoMerge branch 'lf/bundle-with-tip-wo-message'
2013-04-15  Junio C HamanoMerge branch 'jk/show-branch-strbuf'
2013-04-12  Junio C HamanoMerge branch 'mg/texinfo-5' into maint
2013-04-12  Junio C HamanoMerge branch 'jk/diffcore-break-divzero' into maint
2013-04-12  Junio C HamanoMerge branch 'cn/commit-amend-doc' into maint
2013-04-12  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-04-12  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-12  Junio C HamanoMerge branch 'sr/log-SG-no-textconv'
2013-04-12  Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL'
2013-04-07  Junio C HamanoMerge branch 'cn/commit-amend-doc'
2013-04-07  Junio C HamanoMerge branch 'mg/texinfo-5'
2013-04-07  Junio C HamanoMerge branch 'jk/diffcore-break-divzero'
2013-04-07  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned'
2013-04-07  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original'
2013-04-07  Junio C HamanoSync with 1.8.1.6
2013-04-07  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix' into...
2013-04-05  Junio C HamanoMerge branch 'mh/rev-parse-verify-doc'
2013-04-05  Junio C HamanoMerge branch 'jl/submodule-deinit'
2013-04-05  Junio C HamanoMerge branch 'jc/merge-tag-object'
2013-04-04  Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04  Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04  Junio C HamanoMerge branch 'jk/peel-ref' into maint
2013-04-03  Junio C HamanoMerge branch 'jc/sha1-name-object-peeler'
2013-04-03  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent'
2013-04-03  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix'
2013-04-03  Junio C HamanoMerge branch 'mg/gpg-interface-using-status' into maint
2013-04-03  Junio C HamanoMerge branch 'jc/describe' into maint
2013-04-03  Junio C HamanoMerge branch 'jk/alias-in-bare' into maint
2013-04-03  Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time' into maint
2013-04-03  Junio C HamanoMerge branch 'jk/empty-archive' into maint
2013-04-03  Junio C HamanoMerge branch 'ph/tag-force-no-warn-on-creation' into...
2013-04-03  Junio C HamanoMerge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03  Junio C HamanoSync with 1.8.1 maintenance track
2013-04-03  Junio C HamanoMerge branch 'kb/name-hash' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'kk/revwalk-slop-too-many-commit-within...
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03  Junio C HamanoMerge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag' into maint...
2013-04-03  Junio C HamanoMerge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03  Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02  Junio C HamanoMerge branch 'sw/safe-create-leading-dir-race'
2013-04-01  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01  Junio C HamanoMerge branch 'rr/tests-dedup-test-config' into maint
2013-04-01  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag' into maint
next