Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/autoconf-pthread' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/help-c-source-with-gitattributes' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/status-suggest-merge-abort' into maint | Junio C Hamano | 2016-08-10 | 3 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twelfth batch for 2.10 | Junio C Hamano | 2016-08-10 | 1 | -20/+21 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch' | Junio C Hamano | 2016-08-10 | 5 | -17/+132 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7406: fix breakage on OSXsb/submodule-update-dot-branch | Stefan Beller | 2016-08-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: allow '.' for branch value | Stefan Beller | 2016-08-03 | 2 | -1/+52 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: add remote-branch helper | Stefan Beller | 2016-08-03 | 2 | -2/+36 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule-config: keep configured branch around | Stefan Beller | 2016-08-01 | 2 | -1/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: fix usage string for relative-path | Stefan Beller | 2016-08-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: narrow scope of local variable | Stefan Beller | 2016-08-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: respect depth in subsequent fetches | Stefan Beller | 2016-08-01 | 2 | -4/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7406: future proof tests with hard coded depth | Stefan Beller | 2016-08-01 | 1 | -8/+11 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct' | Junio C Hamano | 2016-08-10 | 15 | -294/+419 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: flush output buffer even when erroring outjs/am-3-merge-recursive-direct | Johannes Schindelin | 2016-08-01 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_trees(): ensure that the callers release output buffer | Johannes Schindelin | 2016-08-01 | 3 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: offer an option to retain the output in 'obuf' | Johannes Schindelin | 2016-08-01 | 2 | -5/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: write the commit title in one go | Johannes Schindelin | 2016-08-01 | 1 | -8/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: flush output buffer before printing error messages | Johannes Schindelin | 2016-08-01 | 1 | -48/+68 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am -3: use merge_recursive() directly again | Johannes Schindelin | 2016-07-26 | 1 | -40/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: switch to returning errors instead of dying | Johannes Schindelin | 2016-07-26 | 1 | -27/+35 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: handle return values indicating errors | Johannes Schindelin | 2016-07-26 | 1 | -102/+150 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: allow write_tree_from_memory() to error out | Johannes Schindelin | 2016-07-26 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: avoid returning a wholesale struct | Johannes Schindelin | 2016-07-26 | 1 | -50/+56 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_recursive: abort properly upon errors | Johannes Schindelin | 2016-07-26 | 1 | -5/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive() | Johannes Schindelin | 2016-07-26 | 3 | -1/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: clarify code in was_tracked() | Johannes Schindelin | 2016-07-26 | 1 | -16/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | die(_("BUG")): avoid translating bug messages | Johannes Schindelin | 2016-07-26 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | die("bug"): report bugs consistently | Johannes Schindelin | 2016-07-26 | 9 | -21/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: verify that `pull --rebase` shows the helpful advice when failing | Johannes Schindelin | 2016-07-26 | 1 | -0/+32 |