Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/remote-rename-update-config' | Junio C Hamano | 2020-02-25 | 12 | -90/+305 |
|\ | |||||
| * | remote rename/remove: gently handle remote.pushDefault config | Bert Wesarg | 2020-02-10 | 2 | -2/+129 |
| * | config: provide access to the current line number | Bert Wesarg | 2020-02-10 | 4 | -2/+22 |
| * | remote rename/remove: handle branch.<name>.pushRemote config values | Bert Wesarg | 2020-02-10 | 2 | -2/+36 |
| * | remote: clean-up config callback | Bert Wesarg | 2020-02-10 | 1 | -11/+17 |
| * | remote: clean-up by returning early to avoid one indentation | Bert Wesarg | 2020-02-10 | 1 | -46/+48 |
| * | pull --rebase/remote rename: document and honor single-letter abbreviations r... | Bert Wesarg | 2020-02-10 | 7 | -49/+75 |
* | | The sixth batch for 2.26 | Junio C Hamano | 2020-02-17 | 1 | -29/+15 |
* | | Merge branch 'es/outside-repo-errmsg-hints' | Junio C Hamano | 2020-02-17 | 2 | -2/+4 |
|\ \ | |||||
| * | | prefix_path: show gitdir when arg is outside repo | Emily Shaffer | 2020-02-17 | 2 | -2/+4 |
* | | | Merge branch 'jk/doc-credential-helper' | Junio C Hamano | 2020-02-17 | 2 | -91/+88 |
|\ \ \ | |||||
| * | | | doc: move credential helper info into gitcredentials(7) | Jeff King | 2020-02-14 | 2 | -91/+88 |
* | | | | Merge branch 'js/mingw-open-in-gdb' | Junio C Hamano | 2020-02-17 | 2 | -0/+23 |
|\ \ \ \ | |||||
| * | | | | mingw: add a helper function to attach GDB to the current process | Johannes Schindelin | 2020-02-14 | 2 | -0/+23 |
* | | | | | Merge branch 'js/test-unc-fetch' | Junio C Hamano | 2020-02-17 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | t5580: test cloning without file://, test fetching via UNC paths | Johannes Schindelin | 2020-02-14 | 1 | -0/+12 |
| |/ / / / | |||||
* | | | | | Merge branch 'js/test-avoid-pipe' | Junio C Hamano | 2020-02-17 | 2 | -6/+10 |
|\ \ \ \ \ | |||||
| * | | | | | t9001, t9116: avoid pipes | Johannes Schindelin | 2020-02-14 | 2 | -6/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'js/test-write-junit-xml-fix' | Junio C Hamano | 2020-02-17 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | tests: fix --write-junit-xml with subshells | Johannes Schindelin | 2020-02-12 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/mailinfo-cleanup' | Junio C Hamano | 2020-02-17 | 2 | -25/+52 |
|\ \ \ \ \ | |||||
| * | | | | | mailinfo: factor out some repeated header handling | Jeff King | 2020-02-11 | 1 | -16/+23 |
| * | | | | | mailinfo: be more liberal with header whitespace | Jeff King | 2020-02-11 | 2 | -2/+18 |
| * | | | | | mailinfo: simplify parsing of header values | Jeff King | 2020-02-11 | 1 | -18/+22 |
| * | | | | | mailinfo: treat header values as C strings | Jeff King | 2020-02-11 | 1 | -4/+4 |
* | | | | | | Merge branch 'mr/show-config-scope' | Junio C Hamano | 2020-02-17 | 10 | -139/+248 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | config: add '--show-scope' to print the scope of a config value | Matthew Rogers | 2020-02-10 | 3 | -7/+87 |
| * | | | | | submodule-config: add subomdule config scope | Matthew Rogers | 2020-02-10 | 3 | -1/+6 |
| * | | | | | config: teach git_config_source to remember its scope | Matthew Rogers | 2020-02-10 | 3 | -13/+27 |
| * | | | | | config: preserve scope in do_git_config_sequence | Matthew Rogers | 2020-02-10 | 1 | -1/+2 |
| * | | | | | config: clarify meaning of command line scoping | Matthew Rogers | 2020-02-10 | 3 | -5/+5 |
| * | | | | | config: split repo scope to local and worktree | Matthew Rogers | 2020-02-10 | 5 | -11/+13 |
| * | | | | | config: make scope_name non-static and rename it | Matthew Rogers | 2020-02-10 | 3 | -16/+18 |
| * | | | | | t1300: create custom config file without special characters | Matthew Rogers | 2020-01-24 | 1 | -5/+10 |
| * | | | | | t1300: fix over-indented HERE-DOCs | Matthew Rogers | 2020-01-24 | 1 | -84/+84 |
| * | | | | | config: fix typo in variable name | Matthew Rogers | 2020-01-24 | 1 | -5/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rs/strbuf-insertstr' | Junio C Hamano | 2020-02-17 | 11 | -15/+26 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | mailinfo: don't insert header prefix for handle_content_type() | René Scharfe | 2020-02-10 | 1 | -1/+0 |
| * | | | | strbuf: add and use strbuf_insertstr() | René Scharfe | 2020-02-10 | 11 | -15/+27 |
| |/ / / | |||||
* | | | | Merge branch 'rs/parse-options-concat-dup' | Junio C Hamano | 2020-02-17 | 2 | -26/+18 |
|\ \ \ \ | |||||
| * | | | | parse-options: simplify parse_options_dup() | René Scharfe | 2020-02-10 | 1 | -9/+3 |
| * | | | | parse-options: const parse_options_concat() parameters | René Scharfe | 2020-02-10 | 2 | -2/+3 |
| * | | | | parse-options: factor out parse_options_count() | René Scharfe | 2020-02-10 | 1 | -12/+12 |
| * | | | | parse-options: use COPY_ARRAY in parse_options_concat() | René Scharfe | 2020-02-10 | 1 | -5/+2 |
| |/ / / | |||||
* | | | | Merge branch 'bc/hash-independent-tests-part-8' | Junio C Hamano | 2020-02-17 | 46 | -279/+1817 |
|\ \ \ \ | |||||
| * | | | | t6024: update for SHA-256 | brian m. carlson | 2020-02-07 | 1 | -5/+10 |
| * | | | | t6006: make hash size independent | brian m. carlson | 2020-02-07 | 1 | -1/+3 |
| * | | | | t6000: abstract away SHA-1-specific constants | brian m. carlson | 2020-02-07 | 1 | -5/+8 |
| * | | | | t5703: make test work with SHA-256 | brian m. carlson | 2020-02-07 | 1 | -3/+4 |
| * | | | | t5607: make hash size independent | brian m. carlson | 2020-02-07 | 1 | -1/+1 |