summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-04-08ls-files: use correct format stringLibravatar Thomas Gummerer1-5/+5
2019-04-08gc docs: remove incorrect reference to gc.auto=0Libravatar Ævar Arnfjörð Bjarmason1-2/+1
2019-04-08gc docs: clarify that "gc" doesn't throw away referenced objectsLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2019-04-08gc docs: note "gc --aggressive" in "fast-import"Libravatar Ævar Arnfjörð Bjarmason1-0/+7
2019-04-08gc docs: downplay the usefulness of --aggressiveLibravatar Ævar Arnfjörð Bjarmason1-2/+27
2019-04-08gc docs: note how --aggressive impacts --window & --depthLibravatar Ævar Arnfjörð Bjarmason1-2/+4
2019-04-08gc docs: fix formatting for "gc.writeCommitGraph"Libravatar Ævar Arnfjörð Bjarmason1-2/+2
2019-04-08gc docs: re-flow the "gc.*" section in "config"Libravatar Ævar Arnfjörð Bjarmason1-9/+8
2019-04-08gc docs: include the "gc.*" section from "config" in "gc"Libravatar Ævar Arnfjörð Bjarmason2-80/+35
2019-04-08merge-recursive: switch directory rename detection defaultLibravatar Elijah Newren5-87/+552
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsLibravatar Elijah Newren1-17/+20
2019-04-08merge-recursive: track information associated with directory renamesLibravatar Elijah Newren1-14/+23
2019-04-08t6043: fix copied test description to match its purposeLibravatar Elijah Newren1-2/+2
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecLibravatar Elijah Newren1-268/+215
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesLibravatar Elijah Newren1-16/+15
2019-04-08merge-recursive: track branch where rename occurred in rename structLibravatar Elijah Newren1-71/+42
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoLibravatar Elijah Newren1-50/+21
2019-04-08merge-recursive: shrink rename_conflict_infoLibravatar Elijah Newren1-70/+50
2019-04-08merge-recursive: move some struct declarations togetherLibravatar Elijah Newren1-39/+39
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameLibravatar Elijah Newren1-23/+18
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Libravatar Elijah Newren1-8/+10
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Libravatar Elijah Newren1-23/+23
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Libravatar Elijah Newren1-492/+492
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesLibravatar Elijah Newren15-24/+24
2019-04-08diff: batch fetching of missing blobsLibravatar Jonathan Tan2-0/+137
2019-04-05t: move 'hex2oct' into test-lib-functions.shLibravatar Taylor Blau4-12/+6
2019-04-05progress: assemble percentage and counters in a strbuf before printingLibravatar SZEDER Gábor1-12/+23
2019-04-05progress: make display_progress() return voidLibravatar SZEDER Gábor2-9/+6
2019-04-05tag: fix formattingLibravatar Denton Liu1-4/+5
2019-04-05ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build jobLibravatar SZEDER Gábor1-7/+16
2019-04-05ci: stick with Asciidoctor v1.5.8 for nowLibravatar SZEDER Gábor1-1/+1
2019-04-04send-email: don't cc *-by lines with '-' prefixLibravatar Baruch Siach1-1/+1
2019-04-04cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STRLibravatar Denton Liu1-0/+13
2019-04-04midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STRLibravatar Denton Liu1-1/+1
2019-04-04revision: use a prio_queue to hold rewritten parentsLibravatar Jeff King2-22/+54
2019-04-04contrib/completion: add smerge to the mergetool completion candidatesLibravatar David Aguilar1-1/+2
2019-04-04mergetools: add support for smerge (Sublime Merge)Libravatar David Aguilar2-0/+13
2019-04-03blame.c: don't drop origin blobs as eagerlyLibravatar David Kastrup1-1/+2
2019-04-02read-tree.txt: clarify --reset and worktree changesLibravatar Nguyễn Thái Ngọc Duy1-2/+3
2019-04-02tests (pack-objects): use the full, unabbreviated `--revs` optionLibravatar Johannes Schindelin1-22/+22
2019-04-02tests (status): spell out the `--find-renames` option in fullLibravatar Johannes Schindelin1-4/+4
2019-04-02tests (push): do not abbreviate the `--follow-tags` optionLibravatar Johannes Schindelin1-2/+2
2019-04-02t5531: avoid using an abbreviated optionLibravatar Johannes Schindelin1-1/+1
2019-04-02t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match`Libravatar Johannes Schindelin1-8/+8
2019-04-02tests (rebase): spell out the `--force-rebase` optionLibravatar Johannes Schindelin2-3/+3
2019-04-02tests (rebase): spell out the `--keep-empty` optionLibravatar Johannes Schindelin1-2/+2
2019-04-01index-pack: show progress while checking objectsLibravatar SZEDER Gábor1-1/+9
2019-04-01t6050: redirect expected error output to a fileLibravatar Christian Couder1-1/+2
2019-04-01t6050: use test_line_count instead of wc -lLibravatar Christian Couder1-2/+4
2019-04-01Documentation/git-status: fix titles in porcelain v2 sectionLibravatar Todd Zullinger1-4/+8