summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-04-08ls-files: use correct format stringThomas Gummerer1-5/+5
2019-04-08gc docs: remove incorrect reference to gc.auto=0Ævar Arnfjörð Bjarmason1-2/+1
2019-04-08gc docs: clarify that "gc" doesn't throw away referenced objectsÆvar Arnfjörð Bjarmason1-2/+2
2019-04-08gc docs: note "gc --aggressive" in "fast-import"Ævar Arnfjörð Bjarmason1-0/+7
2019-04-08gc docs: downplay the usefulness of --aggressiveÆvar Arnfjörð Bjarmason1-2/+27
2019-04-08gc docs: note how --aggressive impacts --window & --depthÆvar Arnfjörð Bjarmason1-2/+4
2019-04-08gc docs: fix formatting for "gc.writeCommitGraph"Ævar Arnfjörð Bjarmason1-2/+2
2019-04-08gc docs: re-flow the "gc.*" section in "config"Ævar Arnfjörð Bjarmason1-9/+8
2019-04-08gc docs: include the "gc.*" section from "config" in "gc"Ævar Arnfjörð Bjarmason2-80/+35
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren5-87/+552
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsElijah Newren1-17/+20
2019-04-08merge-recursive: track information associated with directory renamesElijah Newren1-14/+23
2019-04-08t6043: fix copied test description to match its purposeElijah Newren1-2/+2
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecElijah Newren1-265/+212
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesElijah Newren1-16/+15
2019-04-08merge-recursive: track branch where rename occurred in rename structElijah Newren1-71/+42
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoElijah Newren1-50/+21
2019-04-08merge-recursive: shrink rename_conflict_infoElijah Newren1-70/+50
2019-04-08merge-recursive: move some struct declarations togetherElijah Newren1-39/+39
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameElijah Newren1-23/+18
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Elijah Newren1-8/+10
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Elijah Newren1-23/+23
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Elijah Newren1-492/+492
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesElijah Newren15-24/+24
2019-04-08diff: batch fetching of missing blobsJonathan Tan2-0/+137
2019-04-05t: move 'hex2oct' into test-lib-functions.shTaylor Blau4-12/+6
2019-04-05progress: assemble percentage and counters in a strbuf before printingSZEDER Gábor1-12/+23
2019-04-05progress: make display_progress() return voidSZEDER Gábor2-9/+6
2019-04-05tag: fix formattingDenton Liu1-4/+5
2019-04-05ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build jobSZEDER Gábor1-7/+16
2019-04-05ci: stick with Asciidoctor v1.5.8 for nowSZEDER Gábor1-1/+1
2019-04-04send-email: don't cc *-by lines with '-' prefixBaruch Siach1-1/+1
2019-04-04cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STRDenton Liu1-0/+13
2019-04-04midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STRDenton Liu1-1/+1
2019-04-04revision: use a prio_queue to hold rewritten parentsJeff King2-22/+54
2019-04-04contrib/completion: add smerge to the mergetool completion candidatesDavid Aguilar1-1/+2
2019-04-04mergetools: add support for smerge (Sublime Merge)David Aguilar2-0/+13
2019-04-03blame.c: don't drop origin blobs as eagerlyDavid Kastrup1-1/+2
2019-04-02doc: promote "git switch"Nguyễn Thái Ngọc Duy19-105/+105
2019-04-02completion: support switchNguyễn Thái Ngọc Duy1-1/+36
2019-04-02t: add tests for switchNguyễn Thái Ngọc Duy1-0/+96
2019-04-02switch: make --orphan switch to an empty treeNguyễn Thái Ngọc Duy1-8/+31
2019-04-02switch: reject if some operation is in progressNguyễn Thái Ngọc Duy1-0/+40
2019-04-02switch: no worktree status unless real branch switch happensNguyễn Thái Ngọc Duy3-148/+8
2019-04-02switch: implicit dwim, use --no-guess to disable itNguyễn Thái Ngọc Duy2-23/+31
2019-04-02switch: add short option for --detachNguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: only allow explicit detached HEADNguyễn Thái Ngọc Duy1-0/+34
2019-04-02switch: reject "do nothing" caseNguyễn Thái Ngọc Duy1-0/+9
2019-04-02switch: stop accepting pathspecNguyễn Thái Ngọc Duy1-5/+15
2019-04-02switch: remove -lNguyễn Thái Ngọc Duy1-1/+1