Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.10-rc0v2.10.0-rc0 | Junio C Hamano | 2016-08-14 | 2 | -13/+11 |
* | Sync with 2.9.3 | Junio C Hamano | 2016-08-12 | 2 | -1/+12 |
|\ | |||||
| * | Git 2.9.3v2.9.3 | Junio C Hamano | 2016-08-12 | 3 | -2/+13 |
| * | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 | 2 | -59/+41 |
| |\ | |||||
| * \ | Merge branch 'jk/reset-ident-time-per-commit' into maint | Junio C Hamano | 2016-08-12 | 3 | -0/+8 |
| |\ \ | |||||
* | | | | Final batch before 2.10-rc0 | Junio C Hamano | 2016-08-12 | 1 | -2/+36 |
* | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 | 8 | -87/+128 |
|\ \ \ \ | |||||
| * | | | | rebase: avoid computing unnecessary patch IDs | Kevin Willford | 2016-08-11 | 5 | -8/+85 |
| * | | | | patch-ids: add flag to create the diff patch id using header only data | Kevin Willford | 2016-07-29 | 3 | -8/+12 |
| * | | | | patch-ids: replace the seen indicator with a commit pointer | Kevin Willford | 2016-07-29 | 3 | -16/+5 |
| * | | | | patch-ids: stop using a hand-rolled hashmap implementation | Kevin Willford | 2016-07-29 | 2 | -61/+32 |
* | | | | | Merge branch 'ew/http-backend-batch-headers' | Junio C Hamano | 2016-08-12 | 1 | -104/+116 |
|\ \ \ \ \ | |||||
| * | | | | | http-backend: buffer headers before sendingew/http-backend-batch-headers | Eric Wong | 2016-08-10 | 1 | -104/+116 |
* | | | | | | Merge branch 'va/i18n' | Junio C Hamano | 2016-08-12 | 3 | -16/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | i18n: git-stash: mark messages for translation | Vasco Almeida | 2016-08-10 | 1 | -2/+2 |
| * | | | | | | i18n: archive: mark errors for translation | Vasco Almeida | 2016-08-09 | 1 | -5/+5 |
| * | | | | | | i18n: setup: mark error messages for translation | Vasco Almeida | 2016-08-09 | 1 | -9/+9 |
* | | | | | | | Merge branch 'vs/typofix' | Junio C Hamano | 2016-08-12 | 25 | -33/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Spelling fixesvs/typofix | Ville Skyttä | 2016-08-11 | 25 | -33/+33 |
* | | | | | | | | Merge branch 'js/mv-dir-to-new-directory' | Junio C Hamano | 2016-08-12 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directory | Johannes Schindelin | 2016-08-08 | 1 | -4/+7 |
* | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' | Junio C Hamano | 2016-08-12 | 3 | -16/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrev | René Scharfe | 2016-08-06 | 3 | -16/+11 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/big-and-future-archive-tar' | Junio C Hamano | 2016-08-12 | 1 | -10/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | archive-tar: make write_extended_header() voidjk/big-and-future-archive-tar | René Scharfe | 2016-08-06 | 1 | -10/+5 |
* | | | | | | | | | | Merge branch 'jk/trace-fixup' | Junio C Hamano | 2016-08-12 | 3 | -33/+35 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | trace: do not fall back to stderrjk/trace-fixup | Jeff King | 2016-08-05 | 1 | -6/+4 |
| * | | | | | | | | | | write_or_die: drop write_or_whine_pipe() | Jeff King | 2016-08-05 | 2 | -13/+0 |
| * | | | | | | | | | | trace: disable key after write error | Jeff King | 2016-08-05 | 1 | -0/+1 |
| * | | | | | | | | | | trace: correct variable name in write() error message | Jeff King | 2016-08-05 | 1 | -5/+5 |
| * | | | | | | | | | | trace: cosmetic fixes for error messages | Jeff King | 2016-08-05 | 1 | -8/+8 |
| * | | | | | | | | | | trace: use warning() for printing trace errors | Jeff King | 2016-08-05 | 1 | -6/+5 |
| * | | | | | | | | | | trace: stop using write_or_whine_pipe() | Jeff King | 2016-08-04 | 1 | -3/+8 |
| * | | | | | | | | | | trace: handle NULL argument in trace_disable() | Jeff King | 2016-08-04 | 1 | -4/+16 |
* | | | | | | | | | | | Merge branch 'rs/merge-recursive-string-list-init' | Junio C Hamano | 2016-08-12 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge-recursive: use STRING_LIST_INIT_NODUPrs/merge-recursive-string-list-init | René Scharfe | 2016-08-05 | 1 | -2/+1 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rs/merge-add-strategies-simplification' | Junio C Hamano | 2016-08-12 | 1 | -34/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge: use string_list_split() in add_strategies()rs/merge-add-strategies-simplification | René Scharfe | 2016-08-05 | 1 | -34/+10 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'rs/child-process-init' | Junio C Hamano | 2016-08-12 | 2 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | use CHILD_PROCESS_INIT to initialize automatic variablesrs/child-process-init | René Scharfe | 2016-08-05 | 2 | -6/+3 |
* | | | | | | | | | | | | Merge branch 'js/import-tars-hardlinks' | Junio C Hamano | 2016-08-12 | 1 | -11/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | import-tars: support hard linksjs/import-tars-hardlinks | Johannes Schindelin | 2016-08-03 | 1 | -11/+20 |
* | | | | | | | | | | | | | Merge branch 'ms/document-pack-window-memory-is-per-thread' | Junio C Hamano | 2016-08-12 | 2 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | document git-repack interaction of pack.threads and pack.windowMemoryms/document-pack-window-memory-is-per-thread | Michael Stahl | 2016-08-10 | 2 | -4/+6 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'vs/completion-branch-fully-spelled-d-m-r' | Junio C Hamano | 2016-08-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | completion: complete --delete, --move, and --remotes for git branchvs/completion-branch-fully-spelled-d-m-r | Ville Skyttä | 2016-08-09 | 1 | -3/+3 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry' | Junio C Hamano | 2016-08-12 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule--helper: use parallel processor correctlysb/submodule-clone-retry | Stefan Beller | 2016-08-09 | 1 | -2/+6 |
* | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-08-10 | 1 | -0/+68 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Yet another batch for 2.9.3 | Junio C Hamano | 2016-08-10 | 1 | -0/+68 |