summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* worktree prune: improve prune logic when worktree is movednd/worktree-pruneNguyễn Thái Ngọc Duy2018-03-152-5/+5
* worktree: delete dead codeNguyễn Thái Ngọc Duy2018-03-152-13/+0
* gc.txt: more details about what gc doesNguyễn Thái Ngọc Duy2018-03-151-9/+19
* Sixth batch for 2.17Junio C Hamano2018-02-281-5/+25
* Merge branch 'jk/push-options-via-transport-fix'Junio C Hamano2018-02-282-12/+39
|\
| * remote-curl: unquote incoming push-optionsjk/push-options-via-transport-fixJeff King2018-02-202-1/+28
| * t5545: factor out http repository setupJeff King2018-02-201-11/+11
* | Merge branch 'tz/do-not-clean-spec-file'Junio C Hamano2018-02-281-1/+1
|\ \
| * | Makefile: remove *.spec from clean targettz/do-not-clean-spec-fileTodd Zullinger2018-02-171-1/+1
* | | Merge branch 'tg/worktree-create-tracking'Junio C Hamano2018-02-281-2/+3
|\ \ \
| * | | git-worktree.txt: fix indentation of example and text of 'add' commandtg/worktree-create-trackingEric Sunshine2018-02-161-0/+1
| * | | git-worktree.txt: fix missing ")" typoEric Sunshine2018-02-161-2/+2
* | | | Merge branch 'gs/test-unset-xdg-cache-home'Junio C Hamano2018-02-281-0/+1
|\ \ \ \
| * | | | test-lib.sh: unset XDG_CACHE_HOMEgs/test-unset-xdg-cache-homeGenki Sky2018-02-161-0/+1
* | | | | Merge branch 'tk/apply-dev-null-verify-name-fix'Junio C Hamano2018-02-282-1/+18
|\ \ \ \ \
| * | | | | apply: handle Subversion diffs with /dev/null gracefullytk/apply-dev-null-verify-name-fixTatyana Krasnukha2018-02-152-2/+2
| * | | | | apply: demonstrate a problem applying svn diffsJohannes Schindelin2018-02-151-0/+17
* | | | | | Merge branch 'sb/status-doc-fix'Junio C Hamano2018-02-281-2/+2
|\ \ \ \ \ \
| * | | | | | Documentation/git-status: clarify status table for porcelain modesb/status-doc-fixStefan Beller2018-02-151-2/+2
* | | | | | | Merge branch 'es/worktree-add-post-checkout-hook'Junio C Hamano2018-02-282-12/+62
|\ \ \ \ \ \ \
| * | | | | | | worktree: add: fix 'post-checkout' not knowing new worktree locationes/worktree-add-post-checkout-hookEric Sunshine2018-02-152-12/+62
* | | | | | | | Merge branch 'nd/am-quit'Junio C Hamano2018-02-284-4/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | am: support --quitnd/am-quitNguyễn Thái Ngọc Duy2018-02-144-4/+28
* | | | | | | | | Fifth batch for 2.17Junio C Hamano2018-02-271-10/+48
* | | | | | | | | Sync with maintJunio C Hamano2018-02-270-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maintJunio C Hamano2018-02-271-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-273-3/+23
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-273-4/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-276-44/+143
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jt/binsearch-with-fanout'Junio C Hamano2018-02-273-25/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | packfile: refactor hash search with fanout tablejt/binsearch-with-fanoutJonathan Tan2018-02-153-14/+54
| * | | | | | | | | | | | | packfile: remove GIT_DEBUG_LOOKUP log statementsJonathan Tan2018-02-151-11/+0
* | | | | | | | | | | | | | Merge branch 'rd/typofix'Junio C Hamano2018-02-275-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofixRobert P. J. Day2018-02-144-5/+5
| * | | | | | | | | | | | | | t/: correct obvious typo "detahced"Robert P. J. Day2018-02-141-1/+1
* | | | | | | | | | | | | | | Merge branch 'jk/test-hashmap-updates'Junio C Hamano2018-02-271-26/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-hashmap: use "unsigned int" for hash storagejk/test-hashmap-updatesJeff King2018-02-141-2/+3
| * | | | | | | | | | | | | | | test-hashmap: simplify alloc_test_entryJeff King2018-02-141-18/+17
| * | | | | | | | | | | | | | | test-hashmap: use strbuf_getline rather than fgetsJeff King2018-02-141-3/+5
| * | | | | | | | | | | | | | | test-hashmap: use xsnprintf rather than snprintfJeff King2018-02-141-1/+1
| * | | | | | | | | | | | | | | test-hashmap: check allocation computation for overflowJeff King2018-02-141-2/+1
| * | | | | | | | | | | | | | | test-hashmap: use ALLOC_ARRAY rather than bare mallocJeff King2018-02-141-2/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/sq-dequote-on-bogus-input'Junio C Hamano2018-02-272-3/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | sq_dequote: fix extra consumption of source stringjk/sq-dequote-on-bogus-inputJeff King2018-02-142-3/+32
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2018-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fsmonitor: update documentation to remove reference to invalid config settingsbp/fsmonitorBen Peart2018-02-141-2/+2
* | | | | | | | | | | | | | | | Merge branch 'bc/doc-interpret-trailers-grammofix'Junio C Hamano2018-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | docs/interpret-trailers: fix agreement errorbc/doc-interpret-trailers-grammofixbrian m. carlson2018-02-131-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'as/ll-i18n'Junio C Hamano2018-02-275-54/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Mark messages for translationsas/ll-i18nAlexander Shopov2018-02-135-54/+54