index
:
user/sven/git.git
gitweb/more-expires
gitweb/show-remotes
local
master
origin/HEAD
origin/maint
origin/master
Git
Sven Wegener
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
resolve-undo.h
Age
Commit message (
Expand
)
Author
2024-12-18
resolve-undo: stop using `the_repository`
Patrick Steinhardt
2024-06-14
hash-ll: merge with "hash.h"
Patrick Steinhardt
2023-07-31
checkout: allow "checkout -m path" to unmerge removed paths
Junio C Hamano
2023-07-31
resolve-undo: allow resurrecting conflicted state that resolved to deletion
Junio C Hamano
2023-04-24
hash-ll.h: split out of hash.h to remove dependency on repository.h
Elijah Newren
2023-04-11
treewide: reduce includes of cache.h in other headers
Elijah Newren
2019-05-05
*.[ch]: remove extern from function declarations using spatch
Denton Liu
2018-08-15
Add missing includes and forward declarations
Elijah Newren
2018-03-14
resolve-undo: convert struct resolve_undo_info to object_id
brian m. carlson
2013-07-15
convert unmerge_cache to take struct pathspec
Nguyễn Thái Ngọc Duy
2013-03-27
checkout: avoid unnecessary match_pathspec calls
Nguyễn Thái Ngọc Duy
2010-02-01
build: make code "-Wpointer-arith" clean
Junio C Hamano
2009-12-25
resolve-undo: "checkout -m path" uses resolve-undo information
Junio C Hamano
2009-12-25
resolve-undo: record resolved conflicts in a new index extension section
Junio C Hamano