Commits

Branch selector

 master

User selector

newren

Datepicker

All time

Commit History

Commits on Jul 15, 2021

• rename: bump limit defaults yet again

  Show description for 94b82d5
  

  newren

  authored and

  gitster

  committed
  94b82d5

  Copy full SHA for 94b82d5

• diffcore-rename: treat a rename_limit of 0 as unlimited

  Show description for 9dd29db
  

  newren

  authored and

  gitster

  committed
  9dd29db

  Copy full SHA for 9dd29db

• doc: clarify documentation for rename/copy limits

  Show description for 6623a52
  

  newren

  authored and

  gitster

  committed
  6623a52

  Copy full SHA for 6623a52

• diff: correct warning message when renameLimit exceeded

  Show description for 05d2c61
  

  newren

  authored and

  gitster

  committed
  05d2c61

  Copy full SHA for 05d2c61

Commits on Jun 30, 2021

• merge-recursive: handle rename-to-self case

  Show description for 3585d0e
  

  newren

  authored and

  gitster

  committed
  3585d0e

  Copy full SHA for 3585d0e

• merge-ort: ensure we consult df_conflict and path_conflicts

  Show description for a492d53
  

  newren

  authored and

  gitster

  committed
  a492d53

  Copy full SHA for a492d53

• t6423: test directory renames causing rename-to-self

  Show description for 806f832
  

  newren

  authored and

  gitster

  committed
  806f832

  Copy full SHA for 806f832

Commits on Jun 28, 2021

• merge-ort: add prefetching for content merges

  Show description for 2bff554
  

  newren

  authored and

  gitster

  committed
  2bff554

  Copy full SHA for 2bff554

• diffcore-rename: use a different prefetch for basename comparisons

  Show description for 1aedd03
  

  newren

  authored and

  gitster

  committed
  1aedd03

  Copy full SHA for 1aedd03

• diffcore-rename: allow different missing_object_cb functions

  Show description for d331dd3
  

  newren

  authored and

  gitster

  committed
  d331dd3

  Copy full SHA for d331dd3

• t6421: add tests checking for excessive object downloads during merge

  Show description for c75c423
  

  newren

  authored and

  gitster

  committed
  c75c423

  Copy full SHA for c75c423

Commits on Jun 16, 2021

• promisor-remote: output trace2 statistics for number of objects fetched

  Show description for 78cfdd0
  

  newren

  authored and

  gitster

  committed
  78cfdd0

  Copy full SHA for 78cfdd0

Commits on Jun 9, 2021

• merge-ort: miscellaneous touch-ups

  Show description for ef68c3d
  

  newren

  authored and

  gitster

  committed
  ef68c3d

  Copy full SHA for ef68c3d

• Fix various issues found in comments

  Show description for 356da0f
  

  newren

  authored and

  gitster

  committed
  356da0f

  Copy full SHA for 356da0f

• diffcore-rename: avoid unnecessary strdup'ing in break_idx

  Show description for 61bf449
  

  newren

  authored and

  gitster

  committed
  61bf449

  Copy full SHA for 61bf449

• merge-ort: replace string_list_df_name_compare with faster alternative

  Show description for 5a3743d
  

  newren

  authored and

  gitster

  committed
  5a3743d

  Copy full SHA for 5a3743d

Commits on May 27, 2021

• dir: introduce readdir_skip_dot_and_dotdot() helper

  Show description for 906fc55
  

  newren

  authored and

  gitster

  committed
  906fc55

  Copy full SHA for 906fc55

Commits on May 20, 2021

• merge-ort, diffcore-rename: employ cached renames when possible

  Show description for 25e65b6
  

  newren

  authored and

  gitster

  committed
  25e65b6

  Copy full SHA for 25e65b6

• merge-ort: handle interactions of caching and rename/rename(1to1) cases

  Show description for cbdca28
  

  newren

  authored and

  gitster

  committed
  cbdca28

  Copy full SHA for cbdca28

• merge-ort: add helper functions for using cached renames

  Show description for 86b41b3
  

  newren

  authored and

  gitster

  committed
  86b41b3

  Copy full SHA for 86b41b3

• merge-ort: preserve cached renames for the appropriate side

  Show description for d509802
  

  newren

  authored and

  gitster

  committed
  d509802

  Copy full SHA for d509802

• merge-ort: avoid accidental API mis-use

  Show description for 19ceb48
  

  newren

  authored and

  gitster

  committed
  19ceb48

  Copy full SHA for 19ceb48

• merge-ort: add code to check for whether cached renames can be reused

  Show description for 64aceb6
  

  newren

  authored and

  gitster

  committed
  64aceb6

  Copy full SHA for 64aceb6

• merge-ort: populate caches of rename detection results

  Show description for 2734f2e
  

  newren

  authored and

  gitster

  committed
  2734f2e

  Copy full SHA for 2734f2e

• merge-ort: add data structures for in-memory caching of rename detection

  Show description for d29bd6d
  

  newren

  authored and

  gitster

  committed
  d29bd6d

  Copy full SHA for d29bd6d

• t6429: testcases for remembering renames

  Show description for a22099f
  

  newren

  authored and

  gitster

  committed
  a22099f

  Copy full SHA for a22099f

• fast-rebase: write conflict state to working tree, index, and HEAD

  Show description for f950026
  

  newren

  authored and

  gitster

  committed
  f950026

  Copy full SHA for f950026

• fast-rebase: change assert() to BUG()

  Show description for caba91c
  

  newren

  authored and

  gitster

  committed
  caba91c

  Copy full SHA for caba91c

• Documentation/technical: describe remembering renames optimization

  Show description for bb80333
  

  newren

  authored and

  gitster

  committed
  bb80333

  Copy full SHA for bb80333

Commits on May 13, 2021

• git-prompt: work under set -u

  Show description for 5c0cbdb
  

  newren

  authored and

  gitster

  committed
  5c0cbdb

  Copy full SHA for 5c0cbdb

Commits on May 12, 2021

• dir: introduce readdir_skip_dot_and_dotdot() helper

  Show description for b548f0f
  

  newren

  authored and

  gitster

  committed
  b548f0f

  Copy full SHA for b548f0f

• dir: traverse into untracked directories if they may have ignored subfiles

  Show description for dd55fc0
  

  newren

  authored and

  gitster

  committed
  dd55fc0

  Copy full SHA for dd55fc0

• dir: avoid unnecessary traversal into ignored directory

  Show description for aa6e1b2
  

  newren

  authored and

  gitster

  committed
  aa6e1b2

  Copy full SHA for aa6e1b2

• t3001, t7300: add testcase showcasing missed directory traversal

  Show description for a97c7a8
  

  newren

  authored and

  gitster

  committed
  a97c7a8

  Copy full SHA for a97c7a8

• t7300: add testcase showing unnecessary traversal into ignored directory

  Show description for 2e4e43a
  

  newren

  authored and

  gitster

  committed
  2e4e43a

  Copy full SHA for 2e4e43a

Pagination

Previous

Next