summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy2016-12-201-2/+10
* Prepare for 2.9.4Junio C Hamano2016-09-092-1/+84
* Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano2016-09-091-0/+10
|\
| * SubmittingPatches: use gitk's "Copy commit summary" formatBeat Bolli2016-08-271-3/+8
| * SubmittingPatches: document how to reference previous commitsHeiko Voigt2016-08-171-0/+5
* | Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-091-1/+0
|\ \
| * | t1410: remove superfluous 'git reflog' from the 'walk past root' testSZEDER Gábor2016-08-151-1/+0
* | | Merge branch 'rs/mailinfo-lib' into maintJunio C Hamano2016-09-091-7/+2
|\ \ \
| * | | mailinfo: recycle strbuf in check_header()René Scharfe2016-08-141-7/+2
* | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-092-4/+2
|\ \ \ \
| * | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-141-3/+1
| * | | | correct FLEXPTR_* example in commentRené Scharfe2016-08-141-1/+1
* | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-093-16/+11
|\ \ \ \ \
| * | | | | use strbuf_add_unique_abbrev() for adding short hashesRené Scharfe2016-08-063-16/+11
* | | | | | Merge branch 'rs/merge-recursive-string-list-init' into maintJunio C Hamano2016-09-091-2/+1
|\ \ \ \ \ \
| * | | | | | merge-recursive: use STRING_LIST_INIT_NODUPRené Scharfe2016-08-061-2/+1
| |/ / / / /
* | | | | | Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-091-34/+10
|\ \ \ \ \ \
| * | | | | | merge: use string_list_split() in add_strategies()René Scharfe2016-08-061-34/+10
| |/ / / / /
* | | | | | Merge branch 'ls/packet-line-protocol-doc-fix' into maintJunio C Hamano2016-09-091-3/+3
|\ \ \ \ \ \
| * | | | | | pack-protocol: fix maximum pkt-line sizeLars Schneider2016-08-301-3/+3
* | | | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano2016-09-096-1/+35
|\ \ \ \ \ \ \
| * | | | | | | mingw: ensure temporary file handles are not inherited by child processesBen Wijen2016-08-236-2/+23
| * | | | | | | t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
* | | | | | | | Merge branch 'dg/document-git-c-in-git-config-doc' into maintJunio C Hamano2016-09-091-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: mention `git -c` in git-config(1)David Glasser2016-08-231-0/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-093-52/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "display HTML in default browser using Windows' shell API"Johannes Schindelin2016-08-193-52/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/difftool-command-not-found' into maintJunio C Hamano2016-09-092-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: always honor fatal error exit codesJohn Keeping2016-08-162-0/+13
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-092-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: do not mention detach advice for explicit --detach optionStefan Beller2016-08-162-1/+25
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano2016-09-094-12/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: use FLEX_ARRAY in struct merge_remote_descRené Scharfe2016-08-142-3/+2
| * | | | | | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-142-4/+19
| * | | | | | | | commit: factor out set_merge_remote_desc()René Scharfe2016-08-142-7/+14
| * | | | | | | | commit: use xstrdup() in get_merge_parent()René Scharfe2016-08-141-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'js/test-lint-pathname' into maintJunio C Hamano2016-09-091-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | t/Makefile: ensure that paths are valid on platforms we careJohannes Schindelin2016-08-161-1/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-091-4/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`Johannes Schindelin2016-08-081-4/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/import-tars-hardlinks' into maintJunio C Hamano2016-09-091-11/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | import-tars: support hard linksJohannes Schindelin2016-08-031-11/+20
* | | | | | | | | Merge branch 'ms/document-pack-window-memory-is-per-thread' into maintJunio C Hamano2016-09-092-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | document git-repack interaction of pack.threads and pack.windowMemoryMichael Stahl2016-08-102-4/+6
* | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-094-7/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5533: make it pass on case-sensitive filesystemsJohannes Schindelin2016-08-041-1/+1
| * | | | | | | | | | push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-263-5/+15
| * | | | | | | | | | push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-263-1/+30
| * | | | | | | | | | Documentation/git-push: fix placeholder formattingJohn Keeping2016-07-261-1/+1
* | | | | | | | | | | Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-096-10/+57
|\ \ \ \ \ \ \ \ \ \ \