summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vs/typofix'Junio C Hamano2016-08-1225-33/+33
|\
| * Spelling fixesVille Skyttä2016-08-1125-33/+33
* | Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano2016-08-121-4/+7
|\ \
| * | git mv: do not keep slash in `git mv dir non-existing-dir/`Johannes Schindelin2016-08-081-4/+7
* | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-123-16/+11
|\ \ \
| * | | use strbuf_add_unique_abbrev() for adding short hashesRené Scharfe2016-08-063-16/+11
| |/ /
* | | Merge branch 'jk/big-and-future-archive-tar'Junio C Hamano2016-08-121-10/+5
|\ \ \
| * | | archive-tar: make write_extended_header() voidRené Scharfe2016-08-061-10/+5
* | | | Merge branch 'jk/trace-fixup'Junio C Hamano2016-08-123-33/+35
|\ \ \ \
| * | | | trace: do not fall back to stderrJeff King2016-08-051-6/+4
| * | | | write_or_die: drop write_or_whine_pipe()Jeff King2016-08-052-13/+0
| * | | | trace: disable key after write errorJeff King2016-08-051-0/+1
| * | | | trace: correct variable name in write() error messageJeff King2016-08-051-5/+5
| * | | | trace: cosmetic fixes for error messagesJeff King2016-08-051-8/+8
| * | | | trace: use warning() for printing trace errorsJeff King2016-08-051-6/+5
| * | | | trace: stop using write_or_whine_pipe()Jeff King2016-08-041-3/+8
| * | | | trace: handle NULL argument in trace_disable()Jeff King2016-08-041-4/+16
* | | | | Merge branch 'rs/merge-recursive-string-list-init'Junio C Hamano2016-08-121-2/+1
|\ \ \ \ \
| * | | | | merge-recursive: use STRING_LIST_INIT_NODUPRené Scharfe2016-08-061-2/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano2016-08-121-34/+10
|\ \ \ \ \
| * | | | | merge: use string_list_split() in add_strategies()René Scharfe2016-08-061-34/+10
| |/ / / /
* | | | | Merge branch 'rs/child-process-init'Junio C Hamano2016-08-122-6/+3
|\ \ \ \ \
| * | | | | use CHILD_PROCESS_INIT to initialize automatic variablesRené Scharfe2016-08-062-6/+3
* | | | | | Merge branch 'js/import-tars-hardlinks'Junio C Hamano2016-08-121-11/+20
|\ \ \ \ \ \
| * | | | | | import-tars: support hard linksJohannes Schindelin2016-08-031-11/+20
* | | | | | | Merge branch 'ms/document-pack-window-memory-is-per-thread'Junio C Hamano2016-08-122-4/+6
|\ \ \ \ \ \ \
| * | | | | | | document git-repack interaction of pack.threads and pack.windowMemoryMichael Stahl2016-08-102-4/+6
* | | | | | | | Merge branch 'vs/completion-branch-fully-spelled-d-m-r'Junio C Hamano2016-08-121-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: complete --delete, --move, and --remotes for git branchVille Skyttä2016-08-091-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-121-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule--helper: use parallel processor correctlyStefan Beller2016-08-091-2/+6
* | | | | | | | | Sync with maintJunio C Hamano2016-08-101-0/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Yet another batch for 2.9.3Junio C Hamano2016-08-101-0/+68
| * | | | | | | | | Merge branch 'jh/clean-smudge-f-doc' into maintJunio C Hamano2016-08-101-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-107-9/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cp/completion-clone-recurse-submodules' into maintJunio C Hamano2016-08-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hashmap-doc-init' into maintJunio C Hamano2016-08-101-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/nedmalloc-gcc6-warnings' into maintJunio C Hamano2016-08-101-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/gitweb-link-html-escape' into maintJunio C Hamano2016-08-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-104-16/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-102-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pm/build-persistent-https-with-recent-go' into maintJunio C Hamano2016-08-101-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/subtree-2.9-regression' into maintJunio C Hamano2016-08-102-8/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-101-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-103-22/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-enable-httpd-tests' into maintJunio C Hamano2016-08-101-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \