Andrew's git / gitweb.git / history
?
[fr] update french translation 2210/2210
[gitweb.git] / builtin / merge-index.c
2013-09-04 Merge branch 'km/svn-1.8-serf-only' blob | diff | raw
2013-09-04 Merge branch 'jc/check-x-z' blob | diff | raw
2013-09-03 Merge branch 'maint-1.8.3' into maint blob | diff | raw
2013-08-30 Merge branch 'rt/doc-merge-file-diff3' blob | diff | raw
2013-08-30 Merge branch 'rj/doc-rev-parse' blob | diff | raw
2013-08-30 Merge branch 'hv/config-from-blob' blob | diff | raw
2013-08-30 Merge branch 'nd/fetch-pack-shallow-fix' blob | diff | raw
2013-08-13 Merge branch 'sb/mailmap-updates' blob | diff | raw
2013-08-09 Merge branch 'maint' blob | diff | raw
2013-08-09 Merge branch 'jk/submodule-subdirectory-ok' blob | diff | raw
2013-08-09 Merge branch 'sb/mailmap-updates' blob | diff | raw
2013-08-05 Sync with maint to grab trivial doc fixes blob | diff | raw
2013-08-05 Merge branch 'es/blame-L-breakage' blob | diff | raw
2013-08-05 Merge branch 'sb/mailmap-updates' blob | diff | raw
2013-08-05 Merge branch 'dn/test-reject-utf-16' blob | diff | raw
2013-08-05 Merge branch 'bc/commit-invalid-utf8' blob | diff | raw
2013-08-02 Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat' blob | diff | raw
2013-08-02 Merge branch 'jk/cat-file-batch-optim' blob | diff | raw
2013-08-01 Merge branch 'jc/rm-submodule-error-message' blob | diff | raw
2013-08-01 Merge branch 'lf/echo-n-is-not-portable' blob | diff | raw
2013-08-01 Merge branch 'ma/hg-to-git' blob | diff | raw
2013-08-01 Merge branch 'jx/clean-interactive' blob | diff | raw
2013-07-31 Merge branch 'rr/rebase-autostash' blob | diff | raw
2013-07-31 Merge branch 'rj/commit-slab-fix' blob | diff | raw
2013-07-31 Merge branch 'jk/commit-how-to-abort-cherry-pick' blob | diff | raw
2013-07-31 Merge branch 'ds/doc-two-kinds-of-tags' blob | diff | raw
2013-07-31 Merge branch 'rr/maint-tilde-markup-in-doc' blob | diff | raw
2013-07-31 Merge branch 'mh/packed-refs-do-one-ref-recursion' blob | diff | raw
2013-07-30 Merge branch 'jk/capabilities-doc' blob | diff | raw
2013-07-30 Merge branch 'sb/mailmap-updates' blob | diff | raw
2013-07-30 Merge branch 'bc/completion-for-bash-3.0' blob | diff | raw
2013-07-25 Merge branch 'mh/multimail' blob | diff | raw
2013-07-25 Merge branch 'es/contacts' blob | diff | raw
2013-07-25 Merge branch 'ml/cygwin-updates' blob | diff | raw
2013-07-25 Merge branch 'rj/sparse' blob | diff | raw
2013-07-25 Merge branch 'sb/traverse-trees-bitmask-variable-name' blob | diff | raw
2013-07-25 Merge branch 'jk/cat-file-batch-optim' blob | diff | raw
2013-07-25 Merge branch 'ml/avoid-using-grep-on-crlf-files' blob | diff | raw
2013-07-25 Merge branch 'jm/doc-ref-prune' blob | diff | raw
2013-07-25 Merge branch 'rh/template-updates' blob | diff | raw
2013-07-25 Merge branch 'mh/ref-races-optim-invalidate-cached' blob | diff | raw
2013-07-25 Merge branch 'sb/misc-fixes' blob | diff | raw
2013-07-25 Merge branch 'tr/line-log' blob | diff | raw
2013-07-23 Merge branch 'mv/merge-ff-tristate' blob | diff | raw
2013-07-22 Sync with Git 1.8.3.4 blob | diff | raw
2013-07-22 Merge branch 'jc/name-rev-exact-ref' blob | diff | raw
2013-07-22 Merge branch 'rr/send-email-ssl-verify' blob | diff | raw
2013-07-22 Merge branch 'es/check-mailmap' blob | diff | raw
2013-07-22 Merge branch 'jx/clean-interactive' blob | diff | raw
2013-07-22 Merge branch 'hv/config-from-blob' blob | diff | raw
2013-07-22 Merge branch 'mk/upload-pack-off-by-one-dead-code-removal' blob | diff | raw
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix' blob | diff | raw
2013-07-22 Merge branch 'nd/const-struct-cache-entry' blob | diff | raw
2013-07-22 Merge branch 'sb/parse-object-buffer-eaten' blob | diff | raw | diff to current
2013-07-22 Merge branch 'rr/maint-fetch-tag-doc-asterisks' into... blob | diff | raw | diff to current
2013-07-22 Merge branch 'mh/maint-lockfile-overflow' into maint blob | diff | raw | diff to current
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint blob | diff | raw | diff to current
2013-07-19 Merge branch 'ft/diff-rename-default-score-is-half... blob | diff | raw | diff to current
2013-07-19 Merge branch 'jc/t1512-fix' into maint blob | diff | raw | diff to current
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix... blob | diff | raw | diff to current
2013-07-12 Merge branch 'rs/pickaxe-simplify' blob | diff | raw | diff to current
2013-07-12 Merge branch 'ft/diff-rename-default-score-is-half' blob | diff | raw | diff to current
2013-07-11 Merge branch 'jc/t1512-fix' blob | diff | raw | diff to current
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf' blob | diff | raw | diff to current
2013-07-11 Merge branch 'mh/maint-lockfile-overflow' blob | diff | raw | diff to current
2013-07-09 Convert "struct cache_entry *" to "const ..." wherever... blob | diff | raw
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint blob | diff | raw | diff to current
2013-07-03 Merge branch 'fc/do-not-use-the-index-in-add-to-index... blob | diff | raw | diff to current
2013-06-27 Merge branch 'mk/combine-diff-context-horizon-fix'... blob | diff | raw | diff to current
2013-06-26 Merge branch 'tr/maint-apply-non-git-patch-parsefix' blob | diff | raw | diff to current
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks' blob | diff | raw | diff to current
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir' blob | diff | raw | diff to current
2013-06-11 Merge branch 'fc/do-not-use-the-index-in-add-to-index' blob | diff | raw | diff to current
2013-06-02 Merge branch 'mk/combine-diff-context-horizon-fix' blob | diff | raw | diff to current
2013-05-29 Merge branch 'jk/lookup-object-prefer-latest' blob | diff | raw | diff to current
2013-05-29 Merge branch 'as/check-ignore' blob | diff | raw | diff to current
2013-05-17 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2013-05-13 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint blob | diff | raw | diff to current
2013-05-01 Merge branch 'hb/git-pm-tempfile' blob | diff | raw | diff to current
2013-04-26 Merge branch 'ph/rebase-original' blob | diff | raw | diff to current
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint blob | diff | raw | diff to current
2013-04-24 Merge branch 'jc/merge-tag-object' into maint blob | diff | raw | diff to current
2013-04-22 Merge branch 'jc/detached-head-doc' into maint blob | diff | raw | diff to current
2013-04-22 Merge branch 'jk/show-branch-strbuf' into maint blob | diff | raw | diff to current
2013-04-22 Merge branch 'js/rerere-forget-protect-against-NUL... blob | diff | raw | diff to current
2013-04-22 Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint blob | diff | raw | diff to current
2013-04-22 Merge branch 'jk/suppress-clang-warning' into maint blob | diff | raw | diff to current
2013-04-22 Merge branch 'jk/filter-branch-come-back-to-original... blob | diff | raw | diff to current
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin' blob | diff | raw | diff to current
2013-04-18 Merge branch 'jc/push-2.0-default-to-simple' (early... blob | diff | raw | diff to current
2013-04-18 Merge branch 'jc/detached-head-doc' blob | diff | raw | diff to current
2013-04-15 Merge branch 'jk/show-branch-strbuf' blob | diff | raw | diff to current
2013-04-12 Merge branch 'jk/diffcore-break-divzero' into maint blob | diff | raw | diff to current
2013-04-12 Merge branch 'cn/commit-amend-doc' into maint blob | diff | raw | diff to current
2013-04-12 Merge branch 'jk/bisect-prn-unsigned' into maint blob | diff | raw | diff to current
2013-04-12 Merge branch 'tb/document-status-u-tradeoff' into maint blob | diff | raw | diff to current
2013-04-12 Merge branch 'sr/log-SG-no-textconv' blob | diff | raw | diff to current
2013-04-12 Merge branch 'js/rerere-forget-protect-against-NUL' blob | diff | raw | diff to current
next