Commits

Branch selector

 master

User selector

newren

Datepicker

All time

Commit History

Commits on Oct 3, 2025

• Documentation/git-merge-tree.adoc: clarify the --merge-base option

  Show description for 1c573a3
  

  newren

  authored and

  gitster

  committed
  1c573a3

  Copy full SHA for 1c573a3

Commits on Aug 7, 2025

• merge-ort: fix directory rename on top of source of other rename/delete

  Show description for f6ecb60
  

  newren

  authored and

  gitster

  committed
  f6ecb60

  Copy full SHA for f6ecb60

• merge-ort: fix incorrect file handling

  Show description for 885ffe5
  

  newren

  authored and

  gitster

  committed
  885ffe5

  Copy full SHA for 885ffe5

• merge-ort: clarify the interning of strings in opt->priv->path

  Show description for d3de978
  

  newren

  authored and

  gitster

  committed
  d3de978

  Copy full SHA for d3de978

• t6423: fix missed staging of file in testcases 12i,12j,12k

  Show description for db5015a
  

  newren

  authored and

  gitster

  committed
  db5015a

  Copy full SHA for db5015a

• t6423: document two bugs with rename-to-self testcases

  Show description for 034b2fd
  

  newren

  authored and

  gitster

  committed
  034b2fd

  Copy full SHA for 034b2fd

• merge-ort: drop unnecessary temporary in check_for_directory_rename()

  Show description for edbe2ab
  

  newren

  authored and

  gitster

  committed
  edbe2ab

  Copy full SHA for edbe2ab

• merge-ort: update comments to modern testfile location

  Show description for c5a2c76
  

  newren

  authored and

  gitster

  committed
  c5a2c76

  Copy full SHA for c5a2c76

Commits on May 16, 2025

• merge-tree: add a new --quiet flag

  Show description for 29d7bf1
  

  newren

  authored and

  gitster

  committed
  29d7bf1

  Copy full SHA for 29d7bf1

• merge-ort: add a new mergeability_only option

  Show description for c6d5ca1
  

  newren

  authored and

  gitster

  committed
  c6d5ca1

  Copy full SHA for c6d5ca1

• sequencer: make it clearer that commit descriptions are just comments

  Show description for e426672
  

  newren

  authored and

  gitster

  committed
  e426672

  Copy full SHA for e426672

Commits on May 14, 2025

• replay: replace the_repository with repo parameter passed to cmd_replay ()

  Show description for d2c3e94
  

  newren

  authored and

  gitster

  committed
  d2c3e94

  Copy full SHA for d2c3e94

Commits on May 2, 2025

• tree-walk.h: fix incorrect API comment

  Show description for f62977b
  

  newren

  authored and

  gitster

  committed
  f62977b

  Copy full SHA for f62977b

Commits on Apr 29, 2025

• hashmap: ensure hashmaps are reusable after hashmap_clear()

  Show description for 9481877
  

  newren

  authored and

  gitster

  committed
  9481877

  Copy full SHA for 9481877

Commits on Apr 8, 2025

• builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

  Show description for 170e30d
  

  newren

  authored and

  gitster

  committed
  170e30d

  Copy full SHA for 170e30d

• tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

  Show description for bfbd201
  

  newren

  authored and

  gitster

  committed
  bfbd201

  Copy full SHA for bfbd201

• merge-recursive.[ch]: thoroughly debug these

  Show description for ad45b32
  

  newren

  authored and

  gitster

  committed
  ad45b32

  Copy full SHA for ad45b32

• merge, sequencer: switch recursive merges over to ort

  Show description for 75cd9ae
  

  newren

  authored and

  gitster

  committed
  75cd9ae

  Copy full SHA for 75cd9ae

• sequencer: switch non-recursive merges over to ort

  Show description for f7ca9bb
  

  newren

  authored and

  gitster

  committed
  f7ca9bb

  Copy full SHA for f7ca9bb

• merge-ort: enable diff-algorithms other than histogram

  Show description for 2e806d8
  

  newren

  authored and

  gitster

  committed
  2e806d8

  Copy full SHA for 2e806d8

• builtin/merge-recursive: switch to using merge_ort_generic()

  Show description for 77c0294
  

  newren

  authored and

  gitster

  committed
  77c0294

  Copy full SHA for 77c0294

• checkout: replace merge_trees() with merge_ort_nonrecursive()

  Show description for b5dff2b
  

  newren

  authored and

  gitster

  committed
  b5dff2b

  Copy full SHA for b5dff2b

Commits on Mar 21, 2025

• treewide: replace assert() with ASSERT() in special cases

  Show description for 5633aa3
  

  newren

  authored and

  gitster

  committed
  5633aa3

  Copy full SHA for 5633aa3

• ci: add build checking for side-effects in assert() calls

  Show description for 85e4f76
  

  newren

  authored and

  gitster

  committed
  85e4f76

  Copy full SHA for 85e4f76

• git-compat-util: introduce ASSERT() macro

  Show description for 07fbc15
  

  newren

  authored and

  gitster

  committed
  07fbc15

  Copy full SHA for 07fbc15

Commits on Mar 18, 2025

• am: switch from merge_recursive_generic() to merge_ort_generic()

  Show description for 947e219
  

  newren

  authored and

  gitster

  committed
  947e219

  Copy full SHA for 947e219

• merge-ort: fix merge.directoryRenames=false

  Show description for a16e8ef
  

  newren

  authored and

  gitster

  committed
  a16e8ef

  Copy full SHA for a16e8ef

• merge-ort: support having merge verbosity be set to 0

  Show description for 3965976
  

  newren

  authored and

  gitster

  committed
  3965976

  Copy full SHA for 3965976

• merge-ort: allow rename detection to be disabled

  Show description for a707d4f
  

  newren

  authored and

  gitster

  committed
  a707d4f

  Copy full SHA for a707d4f

• merge-ort: add new merge_ort_generic() function

  Show description for 4e5d9de
  

  newren

  authored and

  gitster

  committed
  4e5d9de

  Copy full SHA for 4e5d9de

Commits on Mar 17, 2025

• merge-ort: remove extraneous word in comment

  Show description for a18c18b
  

  newren

  authored and

  gitster

  committed
  a18c18b

  Copy full SHA for a18c18b

• merge-ort: fix accidental strset<->strintmap

  Show description for 5692a46
  

  newren

  authored and

  gitster

  committed
  5692a46

  Copy full SHA for 5692a46

• t7615: be more explicit about diff algorithm used

  Show description for a373f93
  

  newren

  authored and

  gitster

  committed
  a373f93

  Copy full SHA for a373f93

• t6423: fix a comment that accidentally reversed two commits

  Show description for 9c69ad2
  

  newren

  authored and

  gitster

  committed
  9c69ad2

  Copy full SHA for 9c69ad2

• stash: remove merge-recursive.h include

  Show description for e40eefb
  

  newren

  authored and

  gitster

  committed
  e40eefb

  Copy full SHA for e40eefb

Pagination

Previous

Next