summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.32.4Taylor Blau2022-10-061-3/+5
|\
| * Sync with 2.31.5Taylor Blau2022-10-061-3/+5
| |\
| | * Sync with 2.30.6Taylor Blau2022-10-061-3/+5
| | |\
| | | * builtin/clone.c: disallow `--local` clones with symlinksTaylor Blau2022-10-011-3/+5
* | | | Merge branch 'da/difftool-dir-diff-symlink-fix' into maintJunio C Hamano2021-10-121-0/+2
|\ \ \ \
| * | | | difftool: fix symlink-file writing in dir-diff modeDavid Aguilar2021-09-231-0/+2
| |/ / /
* | | | Merge branch 'jk/clone-unborn-head-in-bare' into maintJunio C Hamano2021-10-121-16/+17
|\ \ \ \
| * | | | clone: handle unborn branch in bare reposJeff King2021-09-201-16/+17
* | | | | Merge branch 'en/stash-df-fix' into maintJunio C Hamano2021-10-121-3/+17
|\ \ \ \ \
| * | | | | stash: restore untracked files AFTER restoring tracked filesElijah Newren2021-09-111-3/+3
| * | | | | stash: avoid feeding directories to update-indexElijah Newren2021-09-111-0/+14
| |/ / / /
* | | | | Merge branch 'en/am-abort-fix' into maintJunio C Hamano2021-10-121-1/+2
|\ \ \ \ \
| * | | | | am: fix incorrect exit status on am fail to abortElijah Newren2021-09-111-1/+2
| |/ / / /
* | | | | Merge branch 'ps/update-ref-batch-flush' into maintJunio C Hamano2021-10-121-4/+10
|\ \ \ \ \
| * | | | | update-ref: fix streaming of status updatesPatrick Steinhardt2021-09-031-4/+10
| |/ / / /
* | | | | Merge branch 'tb/pack-finalize-ordering' into maintJunio C Hamano2021-10-123-30/+35
|\ \ \ \ \
| * | | | | pack-objects: rename .idx files into place after .bitmap filesÆvar Arnfjörð Bjarmason2021-09-101-1/+2
| * | | | | pack-write: split up finish_tmp_packfile() functionÆvar Arnfjörð Bjarmason2021-09-101-2/+5
| * | | | | builtin/index-pack.c: move `.idx` files into place lastTaylor Blau2021-09-101-2/+2
| * | | | | index-pack: refactor renaming in final()Ævar Arnfjörð Bjarmason2021-09-101-25/+23
| * | | | | builtin/repack.c: move `.idx` files into place lastTaylor Blau2021-09-101-1/+1
| * | | | | pack-write: refactor renaming in finish_tmp_packfile()Ævar Arnfjörð Bjarmason2021-09-101-2/+5
| |/ / / /
* | | | | Merge branch 'so/diff-index-regression-fix' into maintJunio C Hamano2021-10-121-3/+3
|\ \ \ \ \
| * | | | | diff-index: restore -c/--cc options handlingSergey Organov2021-09-071-3/+3
| |/ / / /
* | | | | Merge branch 'tk/fast-export-anonymized-tag-fix' into maintJunio C Hamano2021-10-121-0/+1
|\ \ \ \ \
| * | | | | fast-export: fix anonymized tag using original lengthTal Kelrich2021-08-311-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'sg/column-nl' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \
| * | | | | column: fix parsing of the '--nl' optionSZEDER Gábor2021-08-261-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/branch-allow-deleting-dangling' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \
| * | | | | branch: allow deleting dangling branches with --forceRené Scharfe2021-08-281-1/+1
| |/ / / /
* | | | | Merge branch 'mt/quiet-with-delayed-checkout' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \
| * | | | | checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares2021-08-271-1/+1
| |/ / / /
* | | | | Merge branch 'jk/commit-edit-fixup-fix' into maintJunio C Hamano2021-10-121-2/+3
|\ \ \ \ \
| * | | | | commit: restore --edit when combined with --fixupJoel Klinghed2021-08-151-2/+3
| |/ / / /
* | | | | Merge branch 'en/pull-conflicting-options' into maintJunio C Hamano2021-10-122-12/+45
|\ \ \ \ \
| * | | | | pull: fix handling of multiple headsElijah Newren2021-07-221-4/+14
| * | | | | pull: update docs & code for option compatibility with rebasingElijah Newren2021-07-221-0/+2
| * | | | | pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-4/+6
| * | | | | pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren2021-07-221-1/+15
| * | | | | pull: since --ff-only overrides, handle it firstElijah Newren2021-07-221-8/+8
| * | | | | pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie2021-07-212-4/+9
* | | | | | Merge branch 'jt/push-negotiation-fixes' into maintJunio C Hamano2021-10-122-1/+4
|\ \ \ \ \ \
| * | | | | | fetch: die on invalid --negotiation-tip hashJonathan Tan2021-07-151-1/+3
| * | | | | | send-pack: fix push.negotiate with remote helperJonathan Tan2021-07-151-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ab/pack-stdin-packs-fix' into maintJunio C Hamano2021-10-121-3/+20
|\ \ \ \ \ \
| * | | | | | pack-objects: fix segfault in --stdin-packs optionÆvar Arnfjörð Bjarmason2021-07-091-3/+20
| |/ / / / /
* | | | | | Merge branch 'jc/prefix-filename-allocates' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \ \
| * | | | | | hash-object: prefix_filename() returns allocated memory these daysJunio C Hamano2021-09-081-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/show-branch-simplify' into maintJunio C Hamano2021-10-121-10/+5
|\ \ \ \ \ \
| * | | | | | show-branch: simplify rev_is_head()René Scharfe2021-08-271-10/+5
| |/ / / / /