summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
| * | | | | commit-graph: return if there is no git directoryLessley Dennington2021-12-06-1/+4
| * | | | | git: ensure correct git directory setup with -hLessley Dennington2021-12-06-18/+21
| * | | | | Merge branch 'vd/sparse-reset' into ld/sparse-diff-blameJunio C Hamano2021-11-29-37/+356
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'en/name-rev-shorter-output'Junio C Hamano2021-12-21-4/+13
|\ \ \ \ \ \ \
| * | | | | | | name-rev: prefer shorter names over following mergesElijah Newren2021-12-04-4/+13
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ak/protect-any-current-branch'Junio C Hamano2021-12-21-131/+198
|\ \ \ \ \ \ \
| * | | | | | | branch: protect branches checked out in all worktreesAnders Kaseorg2021-12-01-4/+16
| * | | | | | | receive-pack: protect current branch for bare repository worktreeAnders Kaseorg2021-12-01-5/+17
| * | | | | | | receive-pack: clean dead code from update_worktree()Anders Kaseorg2021-12-01-16/+7
| * | | | | | | fetch: protect branches checked out in all worktreesAnders Kaseorg2021-12-01-35/+58
| * | | | | | | worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg2021-12-01-38/+65
| * | | | | | | branch: lowercase error messagesAnders Kaseorg2021-12-01-13/+13
| * | | | | | | receive-pack: lowercase error messagesAnders Kaseorg2021-12-01-6/+6
| * | | | | | | fetch: lowercase error messagesAnders Kaseorg2021-12-01-24/+26
| |/ / / / / /
* | | | | | | Merge branch 'fs/ssh-signing-other-keytypes'Junio C Hamano2021-12-21-17/+67
|\ \ \ \ \ \ \
| * | | | | | | ssh signing: make sign/amend test more resilientFabian Stelzer2021-11-19-2/+2
| * | | | | | | ssh signing: support non ssh-* keytypesFabian Stelzer2021-11-19-15/+65
* | | | | | | | Merge branch 'fs/ssh-signing-key-lifetime'Junio C Hamano2021-12-21-48/+351
|\ \ \ \ \ \ \ \
| * | | | | | | | ssh signing: verify ssh-keygen in test prereqFabian Stelzer2021-12-09-13/+40
| * | | | | | | | ssh signing: make fmt-merge-msg consider key lifetimeFabian Stelzer2021-12-09-0/+59
| * | | | | | | | ssh signing: make verify-tag consider key lifetimeFabian Stelzer2021-12-09-0/+43
| * | | | | | | | ssh signing: make git log verify key lifetimeFabian Stelzer2021-12-09-0/+45
| * | | | | | | | ssh signing: make verify-commit consider key lifetimeFabian Stelzer2021-12-09-0/+110
| * | | | | | | | ssh signing: add key lifetime test prereqsFabian Stelzer2021-12-09-1/+18
| * | | | | | | | ssh signing: use sigc struct to pass payloadFabian Stelzer2021-12-09-35/+35
| * | | | | | | | t/fmt-merge-msg: make gpgssh tests more specificFabian Stelzer2021-12-09-0/+2
| * | | | | | | | t/fmt-merge-msg: do not redirect stderrFabian Stelzer2021-12-09-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/grep-patterntype-default-doc'Junio C Hamano2021-12-21-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: clarify what `grep.patternType=default` meansJunio C Hamano2021-12-05-1/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/log-decorate-opts-with-implicit-decorate'Junio C Hamano2021-12-21-4/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | log: load decorations with --simplify-by-decorationJeff King2021-12-01-2/+18
| * | | | | | | | log: handle --decorate-refs with userformat "%d"Jeff King2021-12-01-2/+38
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'en/rebase-x-wo-git-dir-env'Junio C Hamano2021-12-21-8/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'Elijah Newren2021-12-04-8/+24
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/c99-var-decl-in-for-loop'Junio C Hamano2021-12-21-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | revision: use C99 declaration of variable in for() loopJunio C Hamano2021-12-03-3/+9
* | | | | | | | | Merge branch 'pw/xdiff-classify-record-in-histogram'Junio C Hamano2021-12-21-42/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xdiff: drop unused flags parameter from recs_matchJeff King2021-12-04-9/+9
| * | | | | | | | | xdiff: drop xpparam_t parameter from histogram cmp_recs()Jeff King2021-12-04-3/+2
| * | | | | | | | | xdiff: drop CMP_ENV macro from xhistogramJeff King2021-12-04-3/+0
| * | | | | | | | | xdiff: simplify comparisonPhillip Wood2021-11-18-4/+1
| * | | | | | | | | xdiff: avoid unnecessary memory allocationsPhillip Wood2021-11-18-4/+7
| * | | | | | | | | diff histogram: intern stringsPhillip Wood2021-11-18-19/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | The third batchJunio C Hamano2021-12-15-0/+65
* | | | | | | | | Merge branch 'ab/die-with-bug'Junio C Hamano2021-12-15-7/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()Ævar Arnfjörð Bjarmason2021-12-07-1/+1
| * | | | | | | | | pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)Ævar Arnfjörð Bjarmason2021-12-07-4/+2
| * | | | | | | | | strbuf.h: use BUG(...) not die("BUG: ...")Ævar Arnfjörð Bjarmason2021-12-07-1/+1
| * | | | | | | | | pack-objects: use BUG(...) not die("BUG: ...")Ævar Arnfjörð Bjarmason2021-12-07-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'hn/allow-bogus-oid-in-ref-tests'Junio C Hamano2021-12-15-90/+169
|\ \ \ \ \ \ \ \ \