]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8e4989e 94cf621)
Merge branch 'jc/add-resolved' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:07 +0000 (08:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:08 +0000 (08:54 -0700)
commitdc33b3f5c4ebc76cf34267b99cb9643fc7dc24f0
tree006569d8dc0bd85b1a3dc8beefb2b028f6dbd346tree | snapshot
parent8e4989e92dc94746c40a5e2ba76f503e3166c8accommit | diff
parent94cf62176ec5e416b7748d60b59bf8f6aa6dd7b3commit | diff
Merge branch 'jc/add-resolved' into jch

'git add' has been taught a new '--resolved' option to stage
conflict-resolved paths, while leaving unrelated local changes
unstaged.  It scans the unmerged paths for leftover conflict
markers and aborts if any are found.

* jc/add-resolved:
  add: introduce '--resolved' option
  read-cache: add remove_file_from_index_with_flags()
  merge-ll: consolidate conflict marker scanning logic
  read-cache: reindent
read-cache.c diff1 | diff2 | blob | history
rerere.c diff1 | diff2 | blob | history
t/meson.build diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.