summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | submodule--helper: use parallel processor correctlysb/submodule-clone-retryStefan 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/autoconf-pthread' into maintJunio C Hamano2016-08-101-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/help-c-source-with-gitattributes' into maintJunio C Hamano2016-08-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano2016-08-103-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twelfth batch for 2.10Junio C Hamano2016-08-101-20/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch'Junio C Hamano2016-08-105-17/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7406: fix breakage on OSXsb/submodule-update-dot-branchStefan Beller2016-08-101-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: allow '.' for branch valueStefan Beller2016-08-032-1/+52
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: add remote-branch helperStefan Beller2016-08-032-2/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule-config: keep configured branch aroundStefan Beller2016-08-012-1/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: fix usage string for relative-pathStefan Beller2016-08-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: narrow scope of local variableStefan Beller2016-08-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: respect depth in subsequent fetchesStefan Beller2016-08-012-4/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7406: future proof tests with hard coded depthStefan Beller2016-08-011-8/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-1015-294/+419
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: flush output buffer even when erroring outjs/am-3-merge-recursive-directJohannes Schindelin2016-08-011-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-013-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin2016-08-012-5/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: write the commit title in one goJohannes Schindelin2016-08-011-8/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: flush output buffer before printing error messagesJohannes Schindelin2016-08-011-48/+68
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am -3: use merge_recursive() directly againJohannes Schindelin2016-07-261-40/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: switch to returning errors instead of dyingJohannes Schindelin2016-07-261-27/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: handle return values indicating errorsJohannes Schindelin2016-07-261-102/+150
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin2016-07-261-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: avoid returning a wholesale structJohannes Schindelin2016-07-261-50/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_recursive: abort properly upon errorsJohannes Schindelin2016-07-261-5/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-263-1/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: clarify code in was_tracked()Johannes Schindelin2016-07-261-16/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | die(_("BUG")): avoid translating bug messagesJohannes Schindelin2016-07-261-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-269-21/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-261-0/+32