summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | refs: prevent accidental NULL dereference in write_pseudorefbrian m. carlson2017-10-161-0/+3
| * | | | | | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-1617-74/+65
| * | | | | | | refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-169-25/+26
| * | | | | | | refs/files-backend: convert struct ref_to_prune to object_idbrian m. carlson2017-10-161-3/+3
| * | | | | | | walker: convert to struct object_idbrian m. carlson2017-10-161-12/+12
* | | | | | | | Merge branch 'jk/revision-pruning-optim'Junio C Hamano2017-11-062-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | revision: quit pruning diff more quickly when possiblejk/revision-pruning-optimJeff King2017-10-142-3/+14
* | | | | | | | | Merge branch 'ds/find-unique-abbrev-optim'Junio C Hamano2017-11-062-16/+123
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_name: minimize OID comparisons during disambiguationDerrick Stolee2017-10-131-5/+71
| * | | | | | | | | sha1_name: parse less while finding common prefixDerrick Stolee2017-10-131-2/+12
| * | | | | | | | | sha1_name: unroll len loop in find_unique_abbrev_r()Derrick Stolee2017-10-131-15/+42
| * | | | | | | | | p4211-line-log.sh: add log --online --raw --parents perf testDerrick Stolee2017-10-131-0/+4
* | | | | | | | | | Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-064-8/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-134-8/+61
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pc/submodule-helper'Junio C Hamano2017-11-062-77/+257
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule: port submodule subcommand 'status' from shell to CPrathamesh Chavan2017-10-072-60/+199
| * | | | | | | | | | submodule--helper: introduce for_each_listed_submodule()Prathamesh Chavan2017-10-071-5/+35
| * | | | | | | | | | submodule--helper: introduce get_submodule_displaypath()Prathamesh Chavan2017-10-021-12/+23
* | | | | | | | | | | Merge branch 'pb/bisect-helper'Junio C Hamano2017-11-065-89/+204
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in Cpb/bisect-helperPranit Bauva2017-10-062-19/+35
| * | | | | | | | | | | t6030: explicitly test for bisection cleanupPranit Bauva2017-10-061-0/+17
| * | | | | | | | | | | bisect--helper: `bisect_clean_state` shell function in CPranit Bauva2017-10-064-24/+56
| * | | | | | | | | | | bisect--helper: `write_terms` shell function in CPranit Bauva2017-10-062-22/+36
| * | | | | | | | | | | bisect--helper: rewrite `check_term_format` shell function in CPranit Bauva2017-10-062-30/+61
| * | | | | | | | | | | bisect--helper: use OPT_CMDMODE instead of OPT_BOOLPranit Bauva2017-10-061-6/+11
* | | | | | | | | | | | Merge branch 'dm/run-command-ignored-hook-advise'Junio C Hamano2017-11-066-0/+66
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | run-command: add hint when a hook is ignoreddm/run-command-ignored-hook-adviseDamien Marié2017-10-106-0/+66
| |/ / / / / / / / / / /
* | | | | | | | | | | | The first batch for 2.16Junio C Hamano2017-11-062-1/+85
* | | | | | | | | | | | Merge branch 'ex/deprecate-empty-pathspec-as-match-all'Junio C Hamano2017-11-064-14/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pathspec: die on empty strings as pathspecex/deprecate-empty-pathspec-as-match-allEmily Xie2017-06-233-13/+8
| * | | | | | | | | | | | t0027: do not use an empty string as a pathspec elementJunio C Hamano2017-06-231-1/+1
* | | | | | | | | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano2017-11-062-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fixJacob Keller2017-11-022-1/+17
* | | | | | | | | | | | | | Merge branch 'cn/diff-indent-no-longer-is-experimental'Junio C Hamano2017-11-064-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimentalCarlos Martín Nieto2017-11-024-9/+6
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-11-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* | | | | | | | | | | | | | | Merge branch 'mh/test-local-canary'Junio C Hamano2017-11-061-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0000: check whether the shell supports the "local" keywordmh/test-local-canaryMichael Haggerty2017-10-311-0/+25
* | | | | | | | | | | | | | | | Merge branch 'js/submodule-in-excluded'Junio C Hamano2017-11-062-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excludedJohannes Schindelin2017-10-262-1/+12
* | | | | | | | | | | | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result'Junio C Hamano2017-11-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-resultAndrey Okoshkin2017-10-211-0/+2
* | | | | | | | | | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes'Junio C Hamano2017-11-064-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | worktree: handle broken symrefs in find_shared_symref()jk/misc-resolve-ref-unsafe-fixesJeff King2017-10-211-1/+2
| * | | | | | | | | | | | | | | | | | log: handle broken HEAD in decoration checkJeff King2017-10-211-1/+1
| * | | | | | | | | | | | | | | | | | remote: handle broken symrefsJeff King2017-10-211-1/+1
| * | | | | | | | | | | | | | | | | | test-ref-store: avoid passing NULL to printfJeff King2017-10-211-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch'Junio C Hamano2017-11-063-78/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | diff.c: get rid of duplicate implementationsb/diff-color-moved-use-xdl-recmatchStefan Beller2017-10-261-78/+4