summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | error_errno: use constant return similar to error()Jeff King2016-08-312-0/+2
| |/ / / /
* | | | | Merge branch 'jk/test-lib-drop-pid-from-results'Junio C Hamano2016-09-121-2/+2
|\ \ \ \ \
| * | | | | test-lib: drop PID from test-results/*.countjk/test-lib-drop-pid-from-resultsJeff King2016-08-301-2/+2
| |/ / / /
* | | | | Merge branch 'jc/am-read-author-file'Junio C Hamano2016-09-121-58/+45
|\ \ \ \ \
| * | | | | am: refactor read_author_script()jc/am-read-author-fileJunio C Hamano2016-08-301-58/+45
* | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-1220-161/+1663
|\ \ \ \ \ \
| * | | | | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-317-21/+863
| * | | | | | submodule: refactor show_submodule_summary with helper functionJacob Keller2016-08-311-33/+82
| * | | | | | submodule: convert show_submodule_summary to use struct object_id *Jacob Keller2016-08-313-10/+10
| * | | | | | allow do_submodule_path to work even if submodule isn't checked outJacob Keller2016-08-315-11/+173
| * | | | | | diff: prepare for additional submodule formatsJacob Keller2016-08-312-7/+12
| * | | | | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-3111-80/+504
| * | | | | | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-313-4/+1
| * | | | | | cache: add empty_tree_oid object and helper functionJacob Keller2016-08-312-4/+27
* | | | | | | Sync with maintJunio C Hamano2016-09-081-0/+83
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-08303-18845/+35770
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Prepare for 2.9.4Junio C Hamano2016-09-082-1/+84
| * | | | | | Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano2016-09-081-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-081-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/mailinfo-lib' into maintJunio C Hamano2016-09-081-7/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-082-4/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-083-16/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/merge-recursive-string-list-init' into maintJunio C Hamano2016-09-081-2/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-081-34/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/packet-line-protocol-doc-fix' into maintJunio C Hamano2016-09-081-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano2016-09-086-1/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/document-git-c-in-git-config-doc' into maintJunio C Hamano2016-09-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-083-52/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/difftool-command-not-found' into maintJunio C Hamano2016-09-082-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-082-1/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano2016-09-084-12/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/test-lint-pathname' into maintJunio C Hamano2016-09-081-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-081-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/import-tars-hardlinks' into maintJunio C Hamano2016-09-081-11/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/document-pack-window-memory-is-per-thread' into maintJunio C Hamano2016-09-082-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-084-7/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-086-10/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-0810-90/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/common-main' into maintJunio C Hamano2016-09-0853-153/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Start the 2.11 cycleJunio C Hamano2016-09-083-2/+58
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bh/diff-highlight-graph'Junio C Hamano2016-09-085-6/+338
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: avoid highlighting combined diffsbh/diff-highlight-graphJeff King2016-08-312-1/+38
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add multi-byte testsJeff King2016-08-311-1/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: ignore test cruftJeff King2016-08-311-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add support for --graph outputBrian Henderson2016-08-292-7/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add failing test for handling --graph outputBrian Henderson2016-08-291-0/+62
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add some testsBrian Henderson2016-08-293-0/+190
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-09-081-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | SubmittingPatches: use gitk's "Copy commit summary" formathv/doc-commit-reference-styleBeat Bolli2016-08-261-3/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-088-121/+379
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status