Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | builtins: annotate always-empty prefix parameters | Jeff King | 2023-03-28 | 7 | -0/+22 |
* | builtins: always pass prefix to parse_options() | Jeff King | 2023-03-28 | 2 | -5/+6 |
* | fast-import: fix file access when run from subdir | Jeff King | 2023-03-28 | 2 | -2/+37 |
* | The fourth batch | Junio C Hamano | 2023-03-28 | 1 | -0/+22 |
* | Merge branch 'fc/docbook-remove-groff-workaround' | Junio C Hamano | 2023-03-28 | 3 | -28/+0 |
|\ | |||||
| * | doc: remove GNU troff workaround | Felipe Contreras | 2023-03-21 | 3 | -28/+0 |
* | | Merge branch 'pe/time-use-gettimeofday' | Junio C Hamano | 2023-03-28 | 1 | -0/+19 |
|\ \ | |||||
| * | | git-compat-util: use gettimeofday(2) for time(2) | Paul Eggert | 2023-03-21 | 1 | -0/+19 |
| |/ | |||||
* | | Merge branch 'jk/fix-proto-downgrade-to-v0' | Junio C Hamano | 2023-03-28 | 7 | -13/+47 |
|\ \ | |||||
| * | | git_connect(): fix corner cases in downgrading v2 to v0 | Jeff King | 2023-03-17 | 7 | -13/+47 |
* | | | Merge branch 'fc/oid-quietly-parse-upstream' | Junio C Hamano | 2023-03-28 | 2 | -2/+8 |
|\ \ \ | |||||
| * | | | object-name: fix quiet @{u} parsing | Felipe Contreras | 2023-03-16 | 2 | -2/+8 |
| |/ / | |||||
* | | | Merge branch 'fc/completion-colors-do-not-need-prompt-command' | Junio C Hamano | 2023-03-28 | 2 | -16/+11 |
|\ \ \ | |||||
| * | | | completion: prompt: use generic colors | Felipe Contreras | 2023-03-16 | 2 | -16/+11 |
| | |/ | |/| | |||||
* | | | The third batch | Junio C Hamano | 2023-03-21 | 1 | -0/+18 |
* | | | Merge branch 'fc/test-aggregation-clean-up' | Junio C Hamano | 2023-03-21 | 3 | -7/+3 |
|\ \ \ | |||||
| * | | | test: don't print aggregate-results command | Felipe Contreras | 2023-03-09 | 2 | -2/+2 |
| * | | | test: simplify counts aggregation | Felipe Contreras | 2023-03-09 | 3 | -7/+3 |
* | | | | Merge branch 'ps/receive-pack-unlock-before-die' | Junio C Hamano | 2023-03-21 | 1 | -4/+10 |
|\ \ \ \ | |||||
| * | | | | receive-pack: fix stale packfile locks when dying | Patrick Steinhardt | 2023-03-10 | 1 | -4/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'aj/ls-files-format-fix' | Junio C Hamano | 2023-03-21 | 2 | -1/+20 |
|\ \ \ \ | |||||
| * | | | | ls-files: fix "--format" output of relative paths | Adam Johnson | 2023-03-10 | 2 | -1/+20 |
* | | | | | Merge branch 'jk/format-patch-ignore-noprefix' | Junio C Hamano | 2023-03-21 | 8 | -6/+118 |
|\ \ \ \ \ | |||||
| * | | | | | rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch | Jeff King | 2023-03-13 | 1 | -1/+1 |
| * | | | | | format-patch: add format.noprefix option | Jeff King | 2023-03-09 | 3 | -0/+26 |
| * | | | | | format-patch: do not respect diff.noprefix | Jeff King | 2023-03-09 | 2 | -0/+14 |
| * | | | | | diff: add --default-prefix option | Jeff King | 2023-03-09 | 3 | -0/+29 |
| * | | | | | t4013: add tests for diff prefix options | Jeff King | 2023-03-09 | 1 | -0/+32 |
| * | | | | | diff: factor out src/dst prefix setup | Jeff King | 2023-03-09 | 2 | -5/+16 |
| | |_|/ / | |/| | | | |||||
* | | | | | The second batch | Junio C Hamano | 2023-03-19 | 1 | -0/+52 |
* | | | | | Merge branch 'jk/add-p-unmerged-fix' | Junio C Hamano | 2023-03-19 | 2 | -1/+23 |
|\ \ \ \ \ | |||||
| * | | | | | add-patch: handle "* Unmerged path" lines | Jeff King | 2023-03-09 | 2 | -1/+23 |
* | | | | | | Merge branch 'ew/fetch-no-write-fetch-head-fix' | Junio C Hamano | 2023-03-19 | 3 | -0/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: pass --no-write-fetch-head to subprocesses | Eric Wong | 2023-03-09 | 3 | -0/+22 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fc/advice-diverged-history' | Junio C Hamano | 2023-03-19 | 3 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | advice: add diverging advice for novices | Felipe Contreras | 2023-03-08 | 3 | -0/+12 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ab/fix-strategy-opts-parsing' | Junio C Hamano | 2023-03-19 | 2 | -2/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sequencer.c: fix overflow & segfault in parse_strategy_opts() | Ævar Arnfjörð Bjarmason | 2023-03-08 | 2 | -2/+25 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ds/reprepare-alternates-when-repreparing-packfiles' | Junio C Hamano | 2023-03-19 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | object-file: reprepare alternates when necessary | Derrick Stolee | 2023-03-09 | 1 | -0/+10 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/format-patch-change-format-for-empty-commits' | Junio C Hamano | 2023-03-19 | 2 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | format-patch: output header for empty commits | John Keeping | 2023-03-03 | 2 | -0/+11 |
* | | | | | | | Merge branch 'jk/bundle-use-dash-for-stdfiles' | Junio C Hamano | 2023-03-19 | 11 | -19/+82 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parse-options: use prefix_filename_except_for_dash() helper | Jeff King | 2023-03-06 | 1 | -3/+1 |
| * | | | | | | | parse-options: consistently allocate memory in fix_filename() | Jeff King | 2023-03-06 | 6 | -11/+20 |
| * | | | | | | | bundle: don't blindly apply prefix_filename() to "-" | Junio C Hamano | 2023-03-06 | 4 | -1/+22 |
| * | | | | | | | bundle: document handling of "-" as stdin | Jeff King | 2023-03-06 | 1 | -3/+5 |
| * | | | | | | | bundle: let "-" mean stdin for reading operations | Jeff King | 2023-03-06 | 2 | -4/+37 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/bundle-progress' | Junio C Hamano | 2023-03-19 | 3 | -24/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bundle: turn on --all-progress-implied by default | Jeff King | 2023-03-06 | 3 | -24/+22 |
| |/ / / / / / |