Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | | | | | | | t5520: test work tree fast-forward when fetch updates head | Paul Tan | 2015-05-29 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test for failure if index has unresolved entries | Paul Tan | 2015-05-29 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test no merge candidates cases | Paul Tan | 2015-05-18 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: prevent field splitting in content comparisons | Paul Tan | 2015-05-18 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/glossary-submodule' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | glossary: add "remote", "submodule", "superproject" | Stefan Beller | 2015-05-29 | |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-doc-intro' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | submodule doc: reorder introductory paragraphs | Stefan Beller | 2015-05-28 | |
| |/ / / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diagnose-config-mmap-failure' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | xmmap(): drop "Out of memory?" | Junio C Hamano | 2015-05-28 | |
| * | | | | | | | | | | | | | | | | | | | config.c: rewrite ENODEV into EISDIR when mmap fails | Jeff King | 2015-05-28 | |
| * | | | | | | | | | | | | | | | | | | | config.c: avoid xmmap error messages | Jeff King | 2015-05-28 | |
| * | | | | | | | | | | | | | | | | | | | config.c: fix mmap leak when writing config | Jeff King | 2015-05-28 | |
| * | | | | | | | | | | | | | | | | | | | read-cache.c: drop PROT_WRITE from mmap of index | Jeff King | 2015-05-28 | |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'mt/p4-depotFile-at-version' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | p4: retrieve the right revision of the file in UTF-16 codepath | Miguel Torroja | 2015-05-27 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/verify-lock-error-report' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): do not capitalize error messages | Michael Haggerty | 2015-05-27 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): do not capitalize error messages | Michael Haggerty | 2015-05-27 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): report errors via a strbuf | Michael Haggerty | 2015-05-27 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): on errors, let the caller unlock the lock | Michael Haggerty | 2015-05-27 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): return 0/-1 rather than struct ref_lock * | Michael Haggerty | 2015-05-27 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT | Jeff King | 2015-05-27 | |
| * | | | | | | | | | | | | | | | | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | |
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-dissociate' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | clone: reorder --dissociate and --reference options | Jeff King | 2015-05-27 | |
| * | | | | | | | | | | | | | | | | | | | | clone: use OPT_STRING_LIST for --reference | Jeff King | 2015-05-27 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-26 | |
| * | | | | | | | | | | | | | | | | | | | | | diff.c: add emit_del_line() and emit_context_line() | Junio C Hamano | 2015-05-26 | |
| * | | | | | | | | | | | | | | | | | | | | | t4015: separate common setup and per-test expectation | Junio C Hamano | 2015-05-26 | |
| * | | | | | | | | | | | | | | | | | | | | | t4015: modernise style | Junio C Hamano | 2015-05-26 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | Sync with 2.4.3 | Junio C Hamano | 2015-06-05 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | Git 2.4.3v2.4.3 | Junio C Hamano | 2015-06-05 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/branch-error-message' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/doc-packfile-vs-pack-file' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fg/document-commit-message-stripping' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rerere-forget-check-enabled' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ja/tutorial-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stripspace-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/asciidoc-markup-fix' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/bundle-verify-arg' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/write-refs-sooner-2.4' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/ref-directory-file' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/log-decorate-HEAD' into maint | Junio C Hamano | 2015-06-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |