summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* docs: fix formatting of rev-parse's --show-superproject-working-treesb/rev-parse-show-superproject-rootSebastian Schuberth2017-10-271-1/+1
* rev-parse: add --show-superproject-working-treeStefan Beller2017-03-085-0/+117
* git svn: fix authentication with 'branch'Hiroshi Shirosaki2017-03-071-3/+3
* First batch after 2.12Junio C Hamano2017-02-273-2/+153
* Merge branch 'rl/remote-allow-missing-branch-name-merge'Junio C Hamano2017-02-272-1/+22
|\
| * remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-mergeRoss Lagerwall2017-02-212-1/+22
* | Merge branch 'km/delete-ref-reflog-message'Junio C Hamano2017-02-2718-30/+58
|\ \
| * | branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-messageKyle Meyer2017-02-206-10/+15
| * | rename_ref: replace empty message in HEAD's logKyle Meyer2017-02-202-1/+6
| * | update-ref: pass reflog message to delete_ref()Kyle Meyer2017-02-202-1/+19
| * | delete_ref: accept a reflog message argumentKyle Meyer2017-02-2014-22/+22
* | | Merge branch 'jk/tempfile-ferror-fclose-confusion'Junio C Hamano2017-02-271-2/+7
|\ \ \
| * | | tempfile: set errno to a known value before calling ferror()jk/tempfile-ferror-fclose-confusionJeff King2017-02-171-2/+7
* | | | Merge branch 'vn/xdiff-func-context'Junio C Hamano2017-02-271-8/+6
|\ \ \ \
| * | | | xdiff -W: relax end-of-file function detectionvn/xdiff-func-contextVegard Nossum2017-01-151-8/+6
* | | | | Merge branch 'js/git-path-in-subdir'Junio C Hamano2017-02-274-5/+64
|\ \ \ \ \
| * | | | | rev-parse: fix several options when running in a subdirectoryjs/git-path-in-subdirJohannes Schindelin2017-02-174-9/+16
| * | | | | rev-parse tests: add tests executed from a subdirectoryMichael Rappazzo2017-02-173-2/+54
* | | | | | Merge branch 'mm/two-more-xstrfmt'Junio C Hamano2017-02-272-11/+9
|\ \ \ \ \ \
| * | | | | | bisect_next_all: convert xsnprintf to xstrfmtmm/two-more-xstrfmtMaxim Moseychuk2017-02-161-4/+5
| * | | | | | stop_progress_msg: convert xsnprintf to xstrfmtMaxim Moseychuk2017-02-161-7/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/clean-preserve-errno-in-warning'Junio C Hamano2017-02-271-4/+12
|\ \ \ \ \ \
| * | | | | | clean: use warning_errno() when appropriatend/clean-preserve-errno-in-warningNguyễn Thái Ngọc Duy2017-02-161-4/+12
| |/ / / / /
* | | | | | Merge branch 'jk/show-branch-lift-name-len-limit'Junio C Hamano2017-02-271-29/+13
|\ \ \ \ \ \
| * | | | | | show-branch: use skip_prefix to drop magic numbersjk/show-branch-lift-name-len-limitJeff King2017-02-151-11/+8
| * | | | | | show-branch: store resolved head in heap bufferJeff King2017-02-141-14/+5
| * | | | | | show-branch: drop head_len variableJeff King2017-02-141-6/+2
* | | | | | | Merge branch 'jn/remote-helpers-with-git-dir'Junio C Hamano2017-02-274-3/+22
|\ \ \ \ \ \ \
| * | | | | | | remote helpers: avoid blind fall-back to ".git" when setting GIT_DIRjn/remote-helpers-with-git-dirJonathan Nieder2017-02-142-2/+12
| * | | | | | | remote: avoid reading $GIT_DIR config in non-repoJeff King2017-02-142-1/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/grep-no-index-fix'Junio C Hamano2017-02-272-27/+121
|\ \ \ \ \ \ \
| * | | | | | | grep: treat revs the same for --untracked as for --no-indexjk/grep-no-index-fixJeff King2017-02-142-6/+6
| * | | | | | | grep: do not diagnose misspelt revs with --no-indexJeff King2017-02-142-1/+6
| * | | | | | | grep: avoid resolving revision names in --no-index caseJeff King2017-02-142-0/+19
| * | | | | | | grep: fix "--" rev/pathspec disambiguationJeff King2017-02-142-5/+57
| * | | | | | | grep: re-order rev-parsing loopJeff King2017-02-141-9/+11
| * | | | | | | grep: do not unnecessarily query repo for "--"Jonathan Tan2017-02-142-4/+20
| * | | | | | | grep: move thread initialization a little lowerJeff King2017-02-141-14/+14
* | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs'Junio C Hamano2017-02-273-7/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: ignore old gc.log filesDavid Turner2017-02-133-7/+71
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jh/preload-index-skip-skip'Junio C Hamano2017-02-271-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | preload-index: avoid lstat for skip-worktree itemsjh/preload-index-skip-skipJeff Hostetler2017-02-101-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'mh/submodule-hash'Junio C Hamano2017-02-273-112/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | read_loose_refs(): read refs using resolve_ref_recursively()mh/submodule-hashMichael Haggerty2017-02-133-18/+13
| * | | | | | | | files_ref_store::submodule: use NULL for the main repositoryMichael Haggerty2017-02-101-8/+8
| * | | | | | | | base_ref_store_init(): remove submodule argumentMichael Haggerty2017-02-103-7/+5
| * | | | | | | | refs: push the submodule attribute downMichael Haggerty2017-02-103-42/+43
| * | | | | | | | refs: store submodule ref stores in a hashmapMichael Haggerty2017-02-102-19/+45
| * | | | | | | | register_ref_store(): new functionMichael Haggerty2017-02-101-14/+29
| * | | | | | | | refs: remove some unnecessary handling of submodule == ""Michael Haggerty2017-02-101-11/+2