summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/glossary-submodule'Junio C Hamano2015-06-111-0/+16
|\
| * glossary: add "remote", "submodule", "superproject"sb/glossary-submoduleStefan Beller2015-05-291-0/+16
* | Merge branch 'sb/submodule-doc-intro'Junio C Hamano2015-06-111-28/+22
|\ \
| * | submodule doc: reorder introductory paragraphssb/submodule-doc-introStefan Beller2015-05-281-28/+22
| |/
* | Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano2015-06-114-11/+29
|\ \
| * | xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failureJunio C Hamano2015-05-281-1/+1
| * | config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-281-0/+2
| * | config.c: avoid xmmap error messagesJeff King2015-05-283-6/+21
| * | config.c: fix mmap leak when writing configJeff King2015-05-281-4/+5
| * | read-cache.c: drop PROT_WRITE from mmap of indexJeff King2015-05-281-1/+1
* | | Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano2015-06-111-1/+1
|\ \ \
| * | | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-versionMiguel Torroja2015-05-271-1/+1
* | | | Merge branch 'mh/verify-lock-error-report'Junio C Hamano2015-06-112-21/+33
|\ \ \ \
| * | | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-reportMichael Haggerty2015-05-272-9/+9
| * | | | verify_lock(): do not capitalize error messagesMichael Haggerty2015-05-271-2/+2
| * | | | verify_lock(): report errors via a strbufMichael Haggerty2015-05-271-7/+12
| * | | | verify_lock(): on errors, let the caller unlock the lockMichael Haggerty2015-05-271-4/+4
| * | | | verify_lock(): return 0/-1 rather than struct ref_lock *Michael Haggerty2015-05-271-7/+14
* | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-115-23/+24
|\ \ \ \ \
| * | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-274-20/+20
| * | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-272-2/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/clone-dissociate'Junio C Hamano2015-06-111-13/+4
|\ \ \ \ \
| * | | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2
| * | | | | clone: use OPT_STRING_LIST for --referenceJeff King2015-05-271-11/+2
* | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-114-260/+385
|\ \ \ \ \ \
| * | | | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-264-16/+179
| * | | | | | diff.c: add emit_del_line() and emit_context_line()Junio C Hamano2015-05-261-12/+38
| * | | | | | t4015: separate common setup and per-test expectationJunio C Hamano2015-05-261-12/+13
| * | | | | | t4015: modernise styleJunio C Hamano2015-05-261-238/+173
| | |/ / / / | |/| | | |
* | | | | | Sync with 2.4.3Junio C Hamano2015-06-052-1/+78
|\ \ \ \ \ \
| * | | | | | Git 2.4.3v2.4.3Junio C Hamano2015-06-054-3/+80
| * | | | | | Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-058-35/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano2015-06-051-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-052-2/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-053-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-051-5/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-0519-102/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-053-33/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-053-118/+312
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-052-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-052-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-052-22/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-052-0/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status