summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* builtins: annotate always-empty prefix parametersJeff King2023-03-287-0/+22
* builtins: always pass prefix to parse_options()Jeff King2023-03-282-5/+6
* fast-import: fix file access when run from subdirJeff King2023-03-282-2/+37
* The fourth batchJunio C Hamano2023-03-281-0/+22
* Merge branch 'fc/docbook-remove-groff-workaround'Junio C Hamano2023-03-283-28/+0
|\
| * doc: remove GNU troff workaroundFelipe Contreras2023-03-213-28/+0
* | Merge branch 'pe/time-use-gettimeofday'Junio C Hamano2023-03-281-0/+19
|\ \
| * | git-compat-util: use gettimeofday(2) for time(2)Paul Eggert2023-03-211-0/+19
| |/
* | Merge branch 'jk/fix-proto-downgrade-to-v0'Junio C Hamano2023-03-287-13/+47
|\ \
| * | git_connect(): fix corner cases in downgrading v2 to v0Jeff King2023-03-177-13/+47
* | | Merge branch 'fc/oid-quietly-parse-upstream'Junio C Hamano2023-03-282-2/+8
|\ \ \
| * | | object-name: fix quiet @{u} parsingFelipe Contreras2023-03-162-2/+8
| |/ /
* | | Merge branch 'fc/completion-colors-do-not-need-prompt-command'Junio C Hamano2023-03-282-16/+11
|\ \ \
| * | | completion: prompt: use generic colorsFelipe Contreras2023-03-162-16/+11
| | |/ | |/|
* | | The third batchJunio C Hamano2023-03-211-0/+18
* | | Merge branch 'fc/test-aggregation-clean-up'Junio C Hamano2023-03-213-7/+3
|\ \ \
| * | | test: don't print aggregate-results commandFelipe Contreras2023-03-092-2/+2
| * | | test: simplify counts aggregationFelipe Contreras2023-03-093-7/+3
* | | | Merge branch 'ps/receive-pack-unlock-before-die'Junio C Hamano2023-03-211-4/+10
|\ \ \ \
| * | | | receive-pack: fix stale packfile locks when dyingPatrick Steinhardt2023-03-101-4/+10
| | |_|/ | |/| |
* | | | Merge branch 'aj/ls-files-format-fix'Junio C Hamano2023-03-212-1/+20
|\ \ \ \
| * | | | ls-files: fix "--format" output of relative pathsAdam Johnson2023-03-102-1/+20
* | | | | Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano2023-03-218-6/+118
|\ \ \ \ \
| * | | | | rebase: prefer --default-prefix to --{src,dst}-prefix for format-patchJeff King2023-03-131-1/+1
| * | | | | format-patch: add format.noprefix optionJeff King2023-03-093-0/+26
| * | | | | format-patch: do not respect diff.noprefixJeff King2023-03-092-0/+14
| * | | | | diff: add --default-prefix optionJeff King2023-03-093-0/+29
| * | | | | t4013: add tests for diff prefix optionsJeff King2023-03-091-0/+32
| * | | | | diff: factor out src/dst prefix setupJeff King2023-03-092-5/+16
| | |_|/ / | |/| | |
* | | | | The second batchJunio C Hamano2023-03-191-0/+52
* | | | | Merge branch 'jk/add-p-unmerged-fix'Junio C Hamano2023-03-192-1/+23
|\ \ \ \ \
| * | | | | add-patch: handle "* Unmerged path" linesJeff King2023-03-092-1/+23
* | | | | | Merge branch 'ew/fetch-no-write-fetch-head-fix'Junio C Hamano2023-03-193-0/+22
|\ \ \ \ \ \
| * | | | | | fetch: pass --no-write-fetch-head to subprocessesEric Wong2023-03-093-0/+22
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fc/advice-diverged-history'Junio C Hamano2023-03-193-0/+12
|\ \ \ \ \ \
| * | | | | | advice: add diverging advice for novicesFelipe Contreras2023-03-083-0/+12
| |/ / / / /
* | | | | | Merge branch 'ab/fix-strategy-opts-parsing'Junio C Hamano2023-03-192-2/+25
|\ \ \ \ \ \
| * | | | | | sequencer.c: fix overflow & segfault in parse_strategy_opts()Ævar Arnfjörð Bjarmason2023-03-082-2/+25
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ds/reprepare-alternates-when-repreparing-packfiles'Junio C Hamano2023-03-191-0/+10
|\ \ \ \ \ \
| * | | | | | object-file: reprepare alternates when necessaryDerrick Stolee2023-03-091-0/+10
| |/ / / / /
* | | | | | Merge branch 'jk/format-patch-change-format-for-empty-commits'Junio C Hamano2023-03-192-0/+11
|\ \ \ \ \ \
| * | | | | | format-patch: output header for empty commitsJohn Keeping2023-03-032-0/+11
* | | | | | | Merge branch 'jk/bundle-use-dash-for-stdfiles'Junio C Hamano2023-03-1911-19/+82
|\ \ \ \ \ \ \
| * | | | | | | parse-options: use prefix_filename_except_for_dash() helperJeff King2023-03-061-3/+1
| * | | | | | | parse-options: consistently allocate memory in fix_filename()Jeff King2023-03-066-11/+20
| * | | | | | | bundle: don't blindly apply prefix_filename() to "-"Junio C Hamano2023-03-064-1/+22
| * | | | | | | bundle: document handling of "-" as stdinJeff King2023-03-061-3/+5
| * | | | | | | bundle: let "-" mean stdin for reading operationsJeff King2023-03-062-4/+37
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/bundle-progress'Junio C Hamano2023-03-193-24/+22
|\ \ \ \ \ \ \
| * | | | | | | bundle: turn on --all-progress-implied by defaultJeff King2023-03-063-24/+22
| |/ / / / / /