summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/shallow-cleanup'Junio C Hamano2020-05-1316-75/+124
|\
| * shallow: use struct 'shallow_lock' for additional safetyTaylor Blau2020-04-304-16/+31
| * shallow.h: document '{commit,rollback}_shallow_file'Taylor Blau2020-04-301-0/+2
| * shallow: extract a header file for shallow-related functionsTaylor Blau2020-04-3016-61/+91
| * commit: make 'commit_graft_pos' non-staticTaylor Blau2020-04-302-1/+3
* | The eighth batchJunio C Hamano2020-05-081-0/+49
* | Merge branch 'cb/test-bash-lineno-fix'Junio C Hamano2020-05-081-8/+10
|\ \
| * | t/test_lib: avoid naked bash arrays in file_linenoCarlo Marcelo Arenas Belón2020-05-071-8/+10
* | | Merge branch 'cb/t0000-use-the-configured-shell'Junio C Hamano2020-05-081-5/+2
|\ \ \
| * | | t/t0000-basic: make sure subtests also use TEST_SHELL_PATHCarlo Marcelo Arenas Belón2020-05-071-5/+2
* | | | Merge branch 'bc/doc-credential-helper-value'Junio C Hamano2020-05-081-3/+7
|\ \ \ \
| * | | | docs: document credential.helper allowed valuesbrian m. carlson2020-05-061-3/+7
* | | | | Merge branch 'dl/doc-stash-remove-mention-of-reflog'Junio C Hamano2020-05-082-3/+3
|\ \ \ \ \
| * | | | | Doc: reference the "stash list" in autostash docsDenton Liu2020-05-052-3/+3
* | | | | | Merge branch 'cb/avoid-colliding-with-netbsd-hmac'Junio C Hamano2020-05-081-3/+3
|\ \ \ \ \ \
| * | | | | | builtin/receive-pack: avoid generic function name hmac()Carlo Marcelo Arenas Belón2020-05-051-3/+3
* | | | | | | Merge branch 'es/restore-staged-from-head-by-default'Junio C Hamano2020-05-083-10/+18
|\ \ \ \ \ \ \
| * | | | | | | restore: default to HEAD when combining --staged and --worktreeEric Sunshine2020-05-053-10/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/arith-expansion-coding-guidelines'Junio C Hamano2020-05-081-4/+0
|\ \ \ \ \ \ \
| * | | | | | | CodingGuidelines: drop arithmetic expansion advice to use "$x"Jeff King2020-05-041-4/+0
| |/ / / / / /
* | | | | | | Merge branch 'ds/sparse-allow-empty-working-tree'Junio C Hamano2020-05-083-41/+13
|\ \ \ \ \ \ \
| * | | | | | | sparse-checkout: stop blocking empty workdirsDerrick Stolee2020-05-043-41/+13
* | | | | | | | Merge branch 'jt/commit-graph-plug-memleak'Junio C Hamano2020-05-081-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: avoid memory leaksJonathan Tan2020-05-041-11/+11
* | | | | | | | | Merge branch 'jk/for-each-ref-multi-key-sort-fix'Junio C Hamano2020-05-086-11/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter: apply fallback refname sort only after all user sortsJeff King2020-05-042-8/+53
| * | | | | | | | | ref-filter: apply --ignore-case to all sorting keysJeff King2020-05-046-3/+51
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/credential-sample-update'Junio C Hamano2020-05-081-5/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitcredentials(7): make shell-snippet example more realisticJeff King2020-05-011-2/+3
| * | | | | | | | | gitcredentials(7): clarify quoting of helper examplesJeff King2020-05-011-5/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/userdiff-markdown'Junio C Hamano2020-05-085-0/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | userdiff: support MarkdownAsh Holland2020-05-025-0/+29
* | | | | | | | | | Merge branch 'cb/credential-store-ignore-bogus-lines'Junio C Hamano2020-05-083-3/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | credential-store: ignore bogus lines from store fileCarlo Marcelo Arenas Belón2020-05-022-3/+92
| * | | | | | | | | | credential-store: document the file format a bit moreJunio C Hamano2020-04-281-0/+4
* | | | | | | | | | | Merge branch 'dl/switch-c-option-in-error-message'Junio C Hamano2020-05-081-4/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | switch: fix errors and comments related to -c and -CDenton Liu2020-04-301-4/+10
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | The seventh batchJunio C Hamano2020-05-051-0/+18
* | | | | | | | | | Merge branch 'js/partial-urlmatch'Junio C Hamano2020-05-053-3/+29
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Sync with js/partial-urlmatch-2.17Junio C Hamano2020-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | credential: handle `credential.<partial-URL>.<key>` againJohannes Schindelin2020-04-244-3/+77
| * | | | | | | | | | | credential: optionally allow partial URLs in credential_from_url_gently()Johannes Schindelin2020-04-241-6/+36
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/partial-urlmatch-2.17'Junio C Hamano2020-05-052-6/+84
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | credential: handle `credential.<partial-URL>.<key>` againJohannes Schindelin2020-04-292-1/+55
| * | | | | | | | | | credential: optionally allow partial URLs in credential_from_url_gently()Johannes Schindelin2020-04-241-6/+36
| * | | | | | | | | | credential: fix grammarJohannes Schindelin2020-04-241-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tb/commit-graph-perm-bits'Junio C Hamano2020-05-058-19/+100
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-graph.c: make 'commit-graph-chain's read-onlyTaylor Blau2020-04-292-1/+4
| * | | | | | | | | | commit-graph.c: ensure graph layers respect core.sharedRepositoryTaylor Blau2020-04-292-0/+28
| * | | | | | | | | | commit-graph.c: write non-split graphs as read-onlyTaylor Blau2020-04-293-2/+18
View Lorry Controller Status