summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/fetch-tags-noclobber'Junio C Hamano2018-09-171-7/+13
|\
| * fetch: stop clobbering existing tags without --forceÆvar Arnfjörð Bjarmason2018-08-311-6/+12
| * fetch: change "branch" to "reference" in --force -h outputÆvar Arnfjörð Bjarmason2018-08-311-1/+1
* | Merge branch 'es/worktree-forced-ops-fix'Junio C Hamano2018-09-171-36/+77
|\ \
| * | worktree: delete .git/worktrees if empty after 'remove'Eric Sunshine2018-08-301-1/+7
| * | worktree: teach 'remove' to override lock when --force given twiceEric Sunshine2018-08-301-5/+6
| * | worktree: teach 'move' to override lock when --force given twiceEric Sunshine2018-08-301-4/+9
| * | worktree: teach 'add' to respect --force for registered but missing pathEric Sunshine2018-08-301-2/+8
| * | worktree: disallow adding same path multiple timesEric Sunshine2018-08-301-0/+25
| * | worktree: prepare for more checks of whether path can become worktreeEric Sunshine2018-08-301-2/+7
| * | worktree: generalize delete_git_dir() to reduce code duplicationEric Sunshine2018-08-301-16/+9
| * | worktree: move delete_git_dir() earlier in file for upcoming new callersEric Sunshine2018-08-301-14/+14
* | | Merge branch 'ds/commit-graph-tests'Junio C Hamano2018-09-171-0/+4
|\ \ \
| * | | commit-graph: define GIT_TEST_COMMIT_GRAPHDerrick Stolee2018-08-291-0/+4
| |/ /
* | | Merge branch 'rs/mailinfo-format-flowed'Junio C Hamano2018-09-171-0/+4
|\ \ \
| * | | mailinfo: support format=flowedRené Scharfe2018-08-291-0/+4
* | | | Merge branch 'jk/cocci'Junio C Hamano2018-09-1722-47/+47
|\ \ \ \
| * | | | convert hashmap comparison functions to oideq()Jeff King2018-08-291-3/+3
| * | | | convert "hashcmp() != 0" to "!hasheq()"Jeff King2018-08-293-4/+4
| * | | | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-296-8/+8
| * | | | convert "hashcmp() == 0" to hasheq()Jeff King2018-08-291-1/+1
| * | | | convert "oidcmp() == 0" to oideq()Jeff King2018-08-2919-31/+31
| | |/ / | |/| |
* | | | Merge branch 'es/format-patch-rangediff'Junio C Hamano2018-09-172-21/+65
|\ \ \ \
| * | | | format-patch: allow --range-diff to apply to a lone-patchEric Sunshine2018-08-141-4/+5
| * | | | format-patch: add --creation-factor tweak for --range-diffEric Sunshine2018-08-141-1/+9
| * | | | format-patch: teach --range-diff to respect -v/--reroll-countEric Sunshine2018-08-141-1/+6
| * | | | format-patch: extend --range-diff to accept revision rangeEric Sunshine2018-08-141-3/+13
| * | | | format-patch: add --range-diff option to embed diff in cover letterEric Sunshine2018-08-141-0/+35
| * | | | range-diff: relieve callers of low-level configuration burdenEric Sunshine2018-08-141-19/+4
| * | | | range-diff: publish default creation factorEric Sunshine2018-08-141-1/+1
| * | | | Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediffJunio C Hamano2018-08-141-21/+61
| |\ \ \ \
* | \ \ \ \ Merge branch 'es/format-patch-interdiff'Junio C Hamano2018-09-171-21/+61
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | format-patch: allow --interdiff to apply to a lone-patchEric Sunshine2018-07-231-3/+5
| * | | | | interdiff: teach show_interdiff() to indent interdiffEric Sunshine2018-07-231-1/+1
| * | | | | format-patch: teach --interdiff to respect -v/--reroll-countEric Sunshine2018-07-231-1/+16
| * | | | | format-patch: add --interdiff option to embed diff in cover letterEric Sunshine2018-07-231-2/+22
| * | | | | format-patch: allow additional generated content in make_cover_letter()Eric Sunshine2018-07-231-20/+23
* | | | | | Merge branch 'cc/delta-islands'Junio C Hamano2018-09-172-43/+103
|\ \ \ \ \ \
| * | | | | | pack-objects: move 'layer' into 'struct packing_data'Christian Couder2018-08-161-2/+2
| * | | | | | pack-objects: move tree_depth into 'struct packing_data'Christian Couder2018-08-161-2/+2
| * | | | | | repack: add delta-islands supportJeff King2018-08-161-0/+9
| * | | | | | pack-objects: add delta-islands supportJeff King2018-08-161-8/+49
| * | | | | | pack-objects: refactor code into compute_layer_order()Christian Couder2018-08-161-40/+50
* | | | | | | Merge branch 'jk/trailer-fixes'Junio C Hamano2018-09-171-0/+1
|\ \ \ \ \ \ \
| * | | | | | | interpret-trailers: allow suppressing "---" dividerJeff King2018-08-231-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/pack-delta-reuse-with-bitmap'Junio C Hamano2018-09-171-9/+19
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: reuse on-disk deltas for thin "have" objectsJeff King2018-08-211-9/+19
* | | | | | | | Merge branch 'ds/reachable'Junio C Hamano2018-09-1711-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-reach: move ref_newer from remote.cDerrick Stolee2018-07-201-0/+1
| * | | | | | | | commit.h: remove method declarationsDerrick Stolee2018-07-2010-0/+10
View Lorry Controller Status