summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/add-i-color-fix'Junio C Hamano2020-12-094-32/+127
|\
| * add -i: verify in the tests that colors can be overriddenJohannes Schindelin2020-11-171-0/+84
| * add -p: prefer color.diff.context over color.diff.plainJohannes Schindelin2020-11-172-5/+7
| * add -i (Perl version): color header to match the C versionJohannes Schindelin2020-11-171-4/+2
| * add -i (built-in): use the same indentation as the Perl versionJohannes Schindelin2020-11-171-1/+1
| * add -p (built-in): do not color the progress indicator separatelyJohannes Schindelin2020-11-171-5/+5
| * add -i (built-in): use correct names to load color.diff.* configJohannes Schindelin2020-11-111-10/+13
| * add -i (built-in): prevent the `reset` "color" from being configuredJohannes Schindelin2020-11-111-1/+3
| * add -i: use `reset_color` consistentlyJohannes Schindelin2020-11-111-2/+2
| * add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headersJohannes Schindelin2020-11-111-3/+8
| * add -i (built-in): send error messages to stderrJohannes Schindelin2020-11-111-1/+1
| * add -i (built-in): do show an error message for incorrect inputsJohannes Schindelin2020-11-111-1/+2
* | Merge branch 'jt/trace-error-on-warning'Junio C Hamano2020-12-092-1/+7
|\ \
| * | usage: add trace2 entry upon warning()Jonathan Tan2020-11-252-1/+7
| |/
* | Tenth batchJunio C Hamano2020-12-031-5/+16
* | Merge branch 'pk/subsub-fetch-fix'Junio C Hamano2020-12-032-67/+10
|\ \
| * | Revert "submodules: fix of regression on fetching of non-init subsub-repo"Junio C Hamano2020-12-032-67/+10
* | | Merge branch 'jk/stop-pack-objects-when-fetch-is-killed'Junio C Hamano2020-12-031-0/+1
|\ \ \
| * | | upload-pack: kill pack-objects helper on signal or exitJeff King2020-12-011-0/+1
| | |/ | |/|
* | | Merge branch 'jk/stop-pack-objects-when-push-is-killed'Junio C Hamano2020-12-031-0/+1
|\ \ \
| * | | send-pack: kill pack-objects helper on signal or exitJeff King2020-11-211-0/+1
| |/ /
* | | Merge branch 'tb/repack-simplify'Junio C Hamano2020-12-031-99/+54
|\ \ \
| * | | builtin/repack.c: don't move existing packs out of the wayTaylor Blau2020-11-171-89/+14
| * | | builtin/repack.c: keep track of what pack-objects wroteTaylor Blau2020-11-171-1/+30
| * | | repack: make "exts" array available outside cmd_repack()Jeff King2020-11-171-9/+10
* | | | Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano2020-12-032-14/+90
|\ \ \ \
| * | | | pull: check for local submodule modifications with the right rangePhilippe Blain2020-11-172-1/+30
| * | | | t5572: describe '--rebase' tests a little morePhilippe Blain2020-11-171-2/+10
| * | | | t5572: add notes on a peculiar testPhilippe Blain2020-11-171-0/+15
| * | | | pull --rebase: compute rebase arguments in separate functionPhilippe Blain2020-11-171-11/+35
| | |/ / | |/| |
* | | | Merge branch 'ab/retire-parse-remote'Junio C Hamano2020-12-036-138/+11
|\ \ \ \
| * | | | submodule: fix fetch_in_submodule logicJeff King2020-11-241-6/+6
| * | | | parse-remote: remove this now-unused libraryÆvar Arnfjörð Bjarmason2020-11-166-129/+0
| * | | | submodule: remove sh function in favor of helperÆvar Arnfjörð Bjarmason2020-11-161-1/+1
| * | | | submodule: use "fetch" logic instead of custom remote discoveryÆvar Arnfjörð Bjarmason2020-11-161-7/+9
| |/ / /
* | | | Ninth batchJunio C Hamano2020-11-301-0/+21
* | | | Merge branch 'sa/credential-store-timeout'Junio C Hamano2020-11-302-2/+12
|\ \ \ \
| * | | | crendential-store: use timeout when locking fileSimão Afonso2020-11-252-2/+12
* | | | | Merge branch 'km/stash-error-message-fix'Junio C Hamano2020-11-301-1/+1
|\ \ \ \ \
| * | | | | stash: add missing space to an error messageKyle Meyer2020-11-241-1/+1
* | | | | | Merge branch 'hn/sleep-millisec-decl'Junio C Hamano2020-11-302-1/+2
|\ \ \ \ \ \
| * | | | | | move sleep_millisec to git-compat-util.hHan-Wen Nienhuys2020-11-252-1/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'js/t3404-master-to-primary'Junio C Hamano2020-11-301-44/+45
|\ \ \ \ \ \
| * | | | | | t3404: do not depend on any specific default branch nameJohannes Schindelin2020-11-241-44/+45
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'na/notes-displayref-is-not-boolean'Junio C Hamano2020-11-302-1/+6
|\ \ \ \ \ \
| * | | | | | t3301: test proper exit response to no-value notes.displayRef.Nate Avers2020-11-231-0/+5
| * | | | | | notes.c: fix a segfault in notes_display_config()Nate Avers2020-11-231-1/+1
* | | | | | | Merge branch 'jc/do-not-just-explain-but-update-your-patch'Junio C Hamano2020-11-301-1/+15
|\ \ \ \ \ \ \
| * | | | | | | MyFirstContribition: answering questions is not the end of the storyJunio C Hamano2020-11-241-1/+15
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mt/worktree-error-message-fix'Junio C Hamano2020-11-301-2/+2
|\ \ \ \ \ \ \