Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vs/typofix' | Junio C Hamano | 2016-08-12 | 25 | -33/+33 |
|\ | |||||
| * | Spelling fixes | 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/` | 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 hashes | 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() void | 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 stderr | 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_NODUP | René Scharfe | 2016-08-06 | 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() | René Scharfe | 2016-08-06 | 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 variables | René Scharfe | 2016-08-06 | 2 | -6/+3 |
* | | | | | | Merge branch 'js/import-tars-hardlinks' | Junio C Hamano | 2016-08-12 | 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' | Junio C Hamano | 2016-08-12 | 2 | -4/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | document git-repack interaction of pack.threads and pack.windowMemory | 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 branch | 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 correctly | 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 |
| * | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 | 7 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cp/completion-clone-recurse-submodules' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 | 1 | -198/+200 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/hashmap-doc-init' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/nedmalloc-gcc6-warnings' into maint | Junio C Hamano | 2016-08-10 | 1 | -9/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/fbsd-lazy-mtime' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/gitweb-link-html-escape' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 | 4 | -16/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 | 2 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pm/build-persistent-https-with-recent-go' into maint | Junio C Hamano | 2016-08-10 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/subtree-2.9-regression' into maint | Junio C Hamano | 2016-08-10 | 2 | -8/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'os/no-verify-skips-commit-msg-too' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/rm-strbuf-optim' into maint | Junio C Hamano | 2016-08-10 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/parse-options-concat' into maint | Junio C Hamano | 2016-08-10 | 3 | -22/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/travis-enable-httpd-tests' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |