summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/remote-rename-update-config'Junio C Hamano2020-02-2512-90/+305
|\
| * remote rename/remove: gently handle remote.pushDefault configBert Wesarg2020-02-102-2/+129
| * config: provide access to the current line numberBert Wesarg2020-02-104-2/+22
| * remote rename/remove: handle branch.<name>.pushRemote config valuesBert Wesarg2020-02-102-2/+36
| * remote: clean-up config callbackBert Wesarg2020-02-101-11/+17
| * remote: clean-up by returning early to avoid one indentationBert Wesarg2020-02-101-46/+48
| * pull --rebase/remote rename: document and honor single-letter abbreviations r...Bert Wesarg2020-02-107-49/+75
* | The sixth batch for 2.26Junio C Hamano2020-02-171-29/+15
* | Merge branch 'es/outside-repo-errmsg-hints'Junio C Hamano2020-02-172-2/+4
|\ \
| * | prefix_path: show gitdir when arg is outside repoEmily Shaffer2020-02-172-2/+4
* | | Merge branch 'jk/doc-credential-helper'Junio C Hamano2020-02-172-91/+88
|\ \ \
| * | | doc: move credential helper info into gitcredentials(7)Jeff King2020-02-142-91/+88
* | | | Merge branch 'js/mingw-open-in-gdb'Junio C Hamano2020-02-172-0/+23
|\ \ \ \
| * | | | mingw: add a helper function to attach GDB to the current processJohannes Schindelin2020-02-142-0/+23
* | | | | Merge branch 'js/test-unc-fetch'Junio C Hamano2020-02-171-0/+12
|\ \ \ \ \
| * | | | | t5580: test cloning without file://, test fetching via UNC pathsJohannes Schindelin2020-02-141-0/+12
| |/ / / /
* | | | | Merge branch 'js/test-avoid-pipe'Junio C Hamano2020-02-172-6/+10
|\ \ \ \ \
| * | | | | t9001, t9116: avoid pipesJohannes Schindelin2020-02-142-6/+10
| |/ / / /
* | | | | Merge branch 'js/test-write-junit-xml-fix'Junio C Hamano2020-02-171-1/+2
|\ \ \ \ \
| * | | | | tests: fix --write-junit-xml with subshellsJohannes Schindelin2020-02-121-1/+2
| |/ / / /
* | | | | Merge branch 'jk/mailinfo-cleanup'Junio C Hamano2020-02-172-25/+52
|\ \ \ \ \
| * | | | | mailinfo: factor out some repeated header handlingJeff King2020-02-111-16/+23
| * | | | | mailinfo: be more liberal with header whitespaceJeff King2020-02-112-2/+18
| * | | | | mailinfo: simplify parsing of header valuesJeff King2020-02-111-18/+22
| * | | | | mailinfo: treat header values as C stringsJeff King2020-02-111-4/+4
* | | | | | Merge branch 'mr/show-config-scope'Junio C Hamano2020-02-1710-139/+248
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | config: add '--show-scope' to print the scope of a config valueMatthew Rogers2020-02-103-7/+87
| * | | | | submodule-config: add subomdule config scopeMatthew Rogers2020-02-103-1/+6
| * | | | | config: teach git_config_source to remember its scopeMatthew Rogers2020-02-103-13/+27
| * | | | | config: preserve scope in do_git_config_sequenceMatthew Rogers2020-02-101-1/+2
| * | | | | config: clarify meaning of command line scopingMatthew Rogers2020-02-103-5/+5
| * | | | | config: split repo scope to local and worktreeMatthew Rogers2020-02-105-11/+13
| * | | | | config: make scope_name non-static and rename itMatthew Rogers2020-02-103-16/+18
| * | | | | t1300: create custom config file without special charactersMatthew Rogers2020-01-241-5/+10
| * | | | | t1300: fix over-indented HERE-DOCsMatthew Rogers2020-01-241-84/+84
| * | | | | config: fix typo in variable nameMatthew Rogers2020-01-241-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs/strbuf-insertstr'Junio C Hamano2020-02-1711-15/+26
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | mailinfo: don't insert header prefix for handle_content_type()René Scharfe2020-02-101-1/+0
| * | | | strbuf: add and use strbuf_insertstr()René Scharfe2020-02-1011-15/+27
| |/ / /
* | | | Merge branch 'rs/parse-options-concat-dup'Junio C Hamano2020-02-172-26/+18
|\ \ \ \
| * | | | parse-options: simplify parse_options_dup()René Scharfe2020-02-101-9/+3
| * | | | parse-options: const parse_options_concat() parametersRené Scharfe2020-02-102-2/+3
| * | | | parse-options: factor out parse_options_count()René Scharfe2020-02-101-12/+12
| * | | | parse-options: use COPY_ARRAY in parse_options_concat()René Scharfe2020-02-101-5/+2
| |/ / /
* | | | Merge branch 'bc/hash-independent-tests-part-8'Junio C Hamano2020-02-1746-279/+1817
|\ \ \ \
| * | | | t6024: update for SHA-256brian m. carlson2020-02-071-5/+10
| * | | | t6006: make hash size independentbrian m. carlson2020-02-071-1/+3
| * | | | t6000: abstract away SHA-1-specific constantsbrian m. carlson2020-02-071-5/+8
| * | | | t5703: make test work with SHA-256brian m. carlson2020-02-071-3/+4
| * | | | t5607: make hash size independentbrian m. carlson2020-02-071-1/+1