Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | config.c: handle error case for fstat() calls | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+10 |
* | Prepare for 2.9.4 | Junio C Hamano | 2016-09-09 | 2 | -1/+84 |
* | Merge branch 'hv/doc-commit-reference-style' into maint | Junio C Hamano | 2016-09-09 | 1 | -0/+10 |
|\ | |||||
| * | SubmittingPatches: use gitk's "Copy commit summary" format | Beat Bolli | 2016-08-27 | 1 | -3/+8 |
| * | SubmittingPatches: document how to reference previous commits | Heiko Voigt | 2016-08-17 | 1 | -0/+5 |
* | | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-09-09 | 1 | -1/+0 |
|\ \ | |||||
| * | | t1410: remove superfluous 'git reflog' from the 'walk past root' test | SZEDER Gábor | 2016-08-15 | 1 | -1/+0 |
* | | | Merge branch 'rs/mailinfo-lib' into maint | Junio C Hamano | 2016-09-09 | 1 | -7/+2 |
|\ \ \ | |||||
| * | | | mailinfo: recycle strbuf in check_header() | René Scharfe | 2016-08-14 | 1 | -7/+2 |
* | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-09-09 | 2 | -4/+2 |
|\ \ \ \ | |||||
| * | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command() | René Scharfe | 2016-08-14 | 1 | -3/+1 |
| * | | | | correct FLEXPTR_* example in comment | René Scharfe | 2016-08-14 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint | Junio C Hamano | 2016-09-09 | 3 | -16/+11 |
|\ \ \ \ \ | |||||
| * | | | | | use strbuf_add_unique_abbrev() for adding short hashes | René Scharfe | 2016-08-06 | 3 | -16/+11 |
* | | | | | | Merge branch 'rs/merge-recursive-string-list-init' into maint | Junio C Hamano | 2016-09-09 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-recursive: use STRING_LIST_INIT_NODUP | René Scharfe | 2016-08-06 | 1 | -2/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/merge-add-strategies-simplification' into maint | Junio C Hamano | 2016-09-09 | 1 | -34/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: use string_list_split() in add_strategies() | René Scharfe | 2016-08-06 | 1 | -34/+10 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ls/packet-line-protocol-doc-fix' into maint | Junio C Hamano | 2016-09-09 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack-protocol: fix maximum pkt-line size | Lars Schneider | 2016-08-30 | 1 | -3/+3 |
* | | | | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint | Junio C Hamano | 2016-09-09 | 6 | -1/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mingw: ensure temporary file handles are not inherited by child processes | Ben Wijen | 2016-08-23 | 6 | -2/+23 |
| * | | | | | | | t6026-merge-attr: child processes must not inherit index.lock handles | Ben Wijen | 2016-08-18 | 1 | -0/+13 |
* | | | | | | | | Merge branch 'dg/document-git-c-in-git-config-doc' into maint | Junio C Hamano | 2016-09-09 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: mention `git -c` in git-config(1) | David Glasser | 2016-08-23 | 1 | -0/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/no-html-bypass-on-windows' into maint | Junio C Hamano | 2016-09-09 | 3 | -52/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "display HTML in default browser using Windows' shell API" | Johannes Schindelin | 2016-08-19 | 3 | -52/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/difftool-command-not-found' into maint | Junio C Hamano | 2016-09-09 | 2 | -0/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool: always honor fatal error exit codes | John Keeping | 2016-08-16 | 2 | -0/+13 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice' into maint | Junio C Hamano | 2016-09-09 | 2 | -1/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: do not mention detach advice for explicit --detach option | Stefan Beller | 2016-08-16 | 2 | -1/+25 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'rs/pull-signed-tag' into maint | Junio C Hamano | 2016-09-09 | 4 | -12/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: use FLEX_ARRAY in struct merge_remote_desc | René Scharfe | 2016-08-14 | 2 | -3/+2 |
| * | | | | | | | | merge-recursive: fix verbose output for multiple base trees | René Scharfe | 2016-08-14 | 2 | -4/+19 |
| * | | | | | | | | commit: factor out set_merge_remote_desc() | René Scharfe | 2016-08-14 | 2 | -7/+14 |
| * | | | | | | | | commit: use xstrdup() in get_merge_parent() | René Scharfe | 2016-08-14 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'js/test-lint-pathname' into maint | Junio C Hamano | 2016-09-09 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/Makefile: ensure that paths are valid on platforms we care | Johannes Schindelin | 2016-08-16 | 1 | -1/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'js/mv-dir-to-new-directory' into maint | Junio C Hamano | 2016-09-09 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/` | Johannes Schindelin | 2016-08-08 | 1 | -4/+7 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/import-tars-hardlinks' into maint | Junio C Hamano | 2016-09-09 | 1 | -11/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | import-tars: support hard links | Johannes Schindelin | 2016-08-03 | 1 | -11/+20 |
* | | | | | | | | | Merge branch 'ms/document-pack-window-memory-is-per-thread' into maint | Junio C Hamano | 2016-09-09 | 2 | -4/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | document git-repack interaction of pack.threads and pack.windowMemory | Michael Stahl | 2016-08-10 | 2 | -4/+6 |
* | | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation' into maint | Junio C Hamano | 2016-09-09 | 4 | -7/+46 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5533: make it pass on case-sensitive filesystems | Johannes Schindelin | 2016-08-04 | 1 | -1/+1 |
| * | | | | | | | | | | push: allow pushing new branches with --force-with-lease | John Keeping | 2016-07-26 | 3 | -5/+15 |
| * | | | | | | | | | | push: add shorthand for --force-with-lease branch creation | John Keeping | 2016-07-26 | 3 | -1/+30 |
| * | | | | | | | | | | Documentation/git-push: fix placeholder formatting | John Keeping | 2016-07-26 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-09 | 6 | -10/+57 |
|\ \ \ \ \ \ \ \ \ \ \ |