projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git.txt: update description of the configuration mechanism
[git.git] / merge-recursive.h
2012-11-26 Junio C HamanoMerge branch 'sg/complete-help-undup' blob | commitdiff | raw
2012-11-26 Junio C HamanoSync with 1.8.0.1 blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'esr/maint-doc-fast-import' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'wtk/submodule-doc-fixup' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'so/prompt-command' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'jk/config-ignore-duplicates' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jk/checkout-out-of-unborn' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'cn/config-missing-path' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jl/submodule-rm' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jk/maint-gitweb-xss' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'rh/maint-gitweb-highlight-ext' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'pw/maint-p4-rcs-expansion-newline' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'mh/alt-odb-string-list-cleanup' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'ta/doc-cleanup' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'kb/preload-index-more' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch' blob | commitdiff | raw
2012-11-20 Junio C HamanoSync with maint blob | commitdiff | raw
2012-11-19 Junio C HamanoSync with maint blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jc/prettier-pretty-note' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mg/maint-pull-suggest-upstream-to' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mh/notes-string-list' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mh/strbuf-split' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mm/maint-doc-commit-edit' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'js/hp-nonstop' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'cr/cvsimport-local-zone' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jc/same-encoding' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'ph/submodule-sync-recursive' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jk/maint-diff-grep-textconv' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jh/symbolic-ref-d' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check' blob | commitdiff | raw
2012-11-09 Jeff KingMerge branch 'ph/maint-submodule-status-fix' blob | commitdiff | raw
2012-11-09 Jeff KingMerge branch 'nd/builtin-to-libgit' blob | commitdiff | raw
2012-10-29 Nguyễn Thái Ngọc DuyMove try_merge_command and checkout_fast_forward to... blob | commitdiff | raw
2012-10-17 Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2012-10-08 Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint blob | commitdiff | raw | diff to current
2012-10-01 Junio C HamanoMerge branch 'os/commit-submodule-ignore' blob | commitdiff | raw | diff to current
2012-09-18 Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint blob | commitdiff | raw | diff to current
2012-09-15 Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint... blob | commitdiff | raw | diff to current
2012-09-12 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2012-09-12 Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' blob | commitdiff | raw | diff to current
2012-09-11 Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh... blob | commitdiff | raw | diff to current
2012-09-11 Junio C HamanoMerge branch 'nd/index-errno' into maint-1.7.11 blob | commitdiff | raw | diff to current
2012-09-11 Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable... blob | commitdiff | raw | diff to current
2012-08-27 Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh' blob | commitdiff | raw | diff to current
2012-08-24 Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11 blob | commitdiff | raw | diff to current
2012-08-22 Junio C HamanoMerge branch 'nd/index-errno' blob | commitdiff | raw | diff to current
2012-08-22 Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable' blob | commitdiff | raw | diff to current
2012-08-06 Junio C HamanoMerge branch 'jn/block-sha1' into maint blob | commitdiff | raw | diff to current
2012-08-06 Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint blob | commitdiff | raw | diff to current
2012-08-06 Junio C HamanoMerge branch 'lm/git-blame-el' into maint blob | commitdiff | raw | diff to current
2012-08-06 Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc' into maint blob | commitdiff | raw | diff to current
2012-08-06 Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix' into... blob | commitdiff | raw | diff to current
2012-07-28 Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix' blob | commitdiff | raw | diff to current
2012-07-24 Junio C HamanoMerge branch 'jn/block-sha1' blob | commitdiff | raw | diff to current
2012-07-22 Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'... blob | commitdiff | raw | diff to current
2012-07-22 Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into maint blob | commitdiff | raw | diff to current
2012-07-22 Junio C HamanoMerge branch 'jc/refactor-diff-stdin' into maint blob | commitdiff | raw | diff to current
2012-07-22 Junio C HamanoMerge branch 'cw/no-detaching-an-unborn' into maint blob | commitdiff | raw | diff to current
2012-07-22 Junio C HamanoMerge branch 'ms/daemon-doc-typo' blob | commitdiff | raw | diff to current
2012-07-16 Junio C HamanoMerge branch 'tg/maint-cache-name-compare' blob | commitdiff | raw | diff to current
2012-07-16 Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths' blob | commitdiff | raw | diff to current
2012-07-13 Junio C HamanoMerge branch 'jc/refactor-diff-stdin' blob | commitdiff | raw | diff to current
2012-07-11 Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev' into maint blob | commitdiff | raw | diff to current
2012-07-11 Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg... blob | commitdiff | raw | diff to current
2012-07-09 Junio C HamanoMerge branch 'cw/no-detaching-an-unborn' blob | commitdiff | raw | diff to current
2012-07-09 Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev' blob | commitdiff | raw | diff to current
2012-07-05 Junio C HamanoMerge branch 'hv/remote-end-hung-up' blob | commitdiff | raw | diff to current
2012-06-25 Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' blob | commitdiff | raw | diff to current
2012-06-25 Junio C HamanoMerge branch 'lm/git-blame-el' blob | commitdiff | raw | diff to current
2012-06-25 Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc' blob | commitdiff | raw | diff to current
2012-06-17 Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into... blob | commitdiff | raw | diff to current
2012-06-12 Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' blob | commitdiff | raw | diff to current
2012-06-03 Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint blob | commitdiff | raw | diff to current
2012-06-01 Junio C HamanoMerge branch 'ef/maint-rebase-error-message' blob | commitdiff | raw | diff to current
2012-06-01 Junio C HamanoMerge branch 'rs/maint-grep-F' into maint blob | commitdiff | raw | diff to current
2012-05-25 Junio C HamanoMerge branch 'rs/maint-grep-F' blob | commitdiff | raw | diff to current
2012-05-23 Junio C HamanoMerge branch 'js/rev-parse-doc-fix' blob | commitdiff | raw | diff to current
2012-05-23 Junio C HamanoMerge branch 'js/rebase-i-p-test-fix' blob | commitdiff | raw | diff to current
2012-05-14 Junio C HamanoMerge branch 'ef/checkout-empty' into maint blob | commitdiff | raw | diff to current
2012-05-14 Junio C HamanoMerge branch 'jk/maint-tformat-with-z' into maint blob | commitdiff | raw | diff to current
2012-05-11 Junio C HamanoMerge branch 'ef/checkout-empty' blob | commitdiff | raw | diff to current
2012-05-11 Junio C HamanoMerge branch 'ah/maint-grep-double-init' into maint blob | commitdiff | raw | diff to current
2012-05-11 Junio C HamanoMerge branch 'fa/maint-config-doc' into maint blob | commitdiff | raw | diff to current
2012-05-10 Junio C HamanoMerge branch 'fa/maint-config-doc' blob | commitdiff | raw | diff to current
2012-05-10 Junio C HamanoMerge branch 'ah/maint-grep-double-init' blob | commitdiff | raw | diff to current
2012-05-08 Junio C HamanoMerge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf blob | commitdiff | raw | diff to current
2012-05-07 Junio C HamanoMerge branch 'jk/maint-tformat-with-z' blob | commitdiff | raw | diff to current
2012-05-07 Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl' into... blob | commitdiff | raw | diff to current
2012-05-07 Junio C HamanoMerge branch 'ef/maint-1.7.6-clone-progress-fix' into... blob | commitdiff | raw | diff to current
2012-05-02 Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl' blob | commitdiff | raw | diff to current
2012-04-26 Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin... blob | commitdiff | raw | diff to current
2012-04-26 Junio C HamanoMerge branch 'jk/add-p-skip-conflicts' into maint blob | commitdiff | raw | diff to current
2012-04-20 Junio C HamanoMerge branch 'jb/am-include' blob | commitdiff | raw | diff to current
2012-04-16 Junio C HamanoMerge branch 'jk/add-p-skip-conflicts' blob | commitdiff | raw | diff to current
2012-04-16 Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin... blob | commitdiff | raw | diff to current
2012-04-10 David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb... blob | commitdiff | raw | diff to current
2012-04-09 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable... blob | commitdiff | raw | diff to current
2012-04-02 Junio C HamanoMerge branch 'pt/gitk' blob | commitdiff | raw | diff to current
next
Git—the stupid content tracker