summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / /
* | | | | Merge branch 'ab/gc-log-rephrase' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \
| * | | | | gc: remove trailing dot from "gc.log" lineÆvar Arnfjörð Bjarmason2021-09-021-1/+1
| |/ / / /
* | | | | Merge branch 'rs/xopen-reports-open-failures' into maintJunio C Hamano2021-10-1211-37/+12
|\ \ \ \ \
| * | | | | use xopen() to handle fatal open(2) failuresRené Scharfe2021-08-2511-37/+12
| |/ / / /
* | | | | Merge branch 'js/maintenance-launchctl-fix' into maintJunio C Hamano2021-10-121-21/+70
|\ \ \ \ \
| * | | | | maintenance: skip bootout/bootstrap when plist is registeredDerrick Stolee2021-08-241-9/+45
| * | | | | maintenance: create `launchctl` configuration using a lock fileJohannes Schindelin2021-08-241-17/+30
| |/ / / /
* | | | | Merge branch 'ab/rebase-fatal-fatal-fix' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \
| * | | | | rebase: emit one "fatal" in "fatal: fatal: <error>"Ævar Arnfjörð Bjarmason2021-08-241-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/ls-remote-packet-trace' into maintJunio C Hamano2021-10-121-0/+2
|\ \ \ \ \
| * | | | | ls-remote: set packet_trace_identity(<name>)Ævar Arnfjörð Bjarmason2021-08-241-0/+2
| |/ / / /
* | | | | Merge branch 'cb/builtin-merge-format-string-fix' into maintJunio C Hamano2021-10-121-3/+5
|\ \ \ \ \
| * | | | | builtin/merge: avoid -Wformat-extra-args from ancient XcodeCarlo Marcelo Arenas Belón2021-08-091-3/+5
* | | | | | Merge branch 'en/merge-strategy-docs' into maintJunio C Hamano2021-10-121-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update error message and code commentElijah Newren2021-08-051-1/+1
* | | | | | Merge branch 'rs/use-fspathhash'Junio C Hamano2021-08-041-8/+2
|\ \ \ \ \ \
| * | | | | | use fspathhash() everywhereRené Scharfe2021-07-301-8/+2
| |/ / / / /
* | | | | | Merge branch 'pb/merge-autostash-more'Junio C Hamano2021-08-041-1/+3
|\ \ \ \ \ \
| * | | | | | merge: apply autostash if merge strategy failsPhilippe Blain2021-07-241-0/+1
| * | | | | | merge: apply autostash if fast-forward failsPhilippe Blain2021-07-241-0/+1
| * | | | | | merge: add missing word "strategy" to a messagePhilippe Blain2021-07-241-1/+1
* | | | | | | Merge branch 'ds/commit-and-checkout-with-sparse-index'Junio C Hamano2021-08-042-5/+6
|\ \ \ \ \ \ \
| * | | | | | | checkout: stop expanding sparse indexesDerrick Stolee2021-07-151-5/+3
| * | | | | | | commit: integrate with sparse-indexDerrick Stolee2021-07-151-0/+3