index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
unpack-trees.c
Commit message (
Expand
)
Author
Age
*
Merge branch 'jk/two-way-merge-corner-case-fix' into maint
Junio C Hamano
2013-12-17
|
\
|
*
unpack-trees: fix "read-tree -u --reset A B" with conflicted index
Jeff King
2013-11-04
*
|
employ new explicit "exists in index?" API
Eric Sunshine
2013-09-17
*
|
unpack-trees: plug a memory leak
Felipe Contreras
2013-08-13
*
|
Convert "struct cache_entry *" to "const ..." wherever possible
Nguyễn Thái Ngọc Duy
2013-07-09
*
|
Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
Junio C Hamano
2013-06-24
|
\
\
|
*
|
unpack-trees: don't shift conflicts left and right
René Scharfe
2013-06-17
*
|
|
unpack-trees: free cache_entry array members for merges
René Scharfe
2013-06-02
*
|
|
diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
René Scharfe
2013-06-02
*
|
|
diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
René Scharfe
2013-06-02
*
|
|
unpack-trees: create working copy of merge entry in merged_entry
René Scharfe
2013-06-02
*
|
|
unpack-trees: factor out dup_entry
René Scharfe
2013-06-02
|
/
/
*
|
dir.c: replace is_path_excluded with now equivalent is_excluded API
Karsten Blees
2013-04-15
*
|
Merge branch 'as/check-ignore'
Junio C Hamano
2013-01-23
|
\
\
|
*
|
dir.c: use a single struct exclude_list per source of excludes
Adam Spiers
2013-01-06
*
|
|
Merge branch 'as/dir-c-cleanup'
Junio C Hamano
2013-01-10
|
\
\
\
|
|
/
/
|
*
|
dir.c: rename free_excludes() to clear_exclude_list()
Adam Spiers
2012-12-28
|
*
|
dir.c: rename excluded_from_list() to is_excluded_from_list()
Adam Spiers
2012-12-28
|
*
|
dir.c: rename path_excluded() to is_path_excluded()
Adam Spiers
2012-12-28
|
*
|
Merge branch 'jc/ls-files-i-dir' into maint
Junio C Hamano
2012-07-11
|
|
\
\
*
|
|
|
oneway_merge(): only lstat() when told to update worktree
Martin von Zweigbergk
2012-12-20
*
|
|
|
Merge branch 'tg/ce-namelen-field'
Junio C Hamano
2012-07-23
|
\
\
\
\
|
*
|
|
|
Strip namelen out of ce_flags into a ce_namelen field
Thomas Gummerer
2012-07-11
*
|
|
|
|
Replace strlen() with ce_namelen()
Thomas Gummerer
2012-07-08
|
/
/
/
/
*
|
|
|
Merge branch 'jc/ls-files-i-dir'
Junio C Hamano
2012-06-21
|
\
\
\
\
|
|
/
/
/
|
/
|
/
/
|
|
/
/
|
*
|
unpack-trees.c: use path_excluded() in check_ok_to_remove()
Junio C Hamano
2012-06-05
|
|
/
*
|
Merge branch 'maint'
Junio C Hamano
2012-05-20
|
\
\
|
*
|
Consistently use "superproject" instead of "supermodule"
Jens Lehmann
2012-05-20
*
|
|
Merge branch 'pw/message-cleanup'
Junio C Hamano
2012-05-02
|
\
\
\
|
*
|
|
remove superfluous newlines in error messages
Pete Wyckoff
2012-04-30
|
|
/
/
*
|
|
Merge branch 'jc/index-v4'
Junio C Hamano
2012-05-02
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
unpack-trees: preserve the index file version of original
Junio C Hamano
2012-04-27
|
|
/
*
|
unpack-trees: plug minor memory leak
René Scharfe
2012-04-10
*
|
unpack-trees: don't perform any index operation if we're not merging
René Scharfe
2012-04-10
|
/
*
tree-walk.c: do not leak internal structure in tree_entry_len()
Nguyễn Thái Ngọc Duy
2011-10-27
*
Merge branch 'nd/maint-sparse-errors'
Junio C Hamano
2011-10-13
|
\
|
*
Add explanation why we do not allow to sparse checkout to empty working tree
Nguyễn Thái Ngọc Duy
2011-09-22
|
*
sparse checkout: show error messages when worktree shaping fails
Nguyễn Thái Ngọc Duy
2011-09-22
*
|
Merge branch 'mg/maint-doc-sparse-checkout'
Junio C Hamano
2011-10-05
|
\
\
|
*
|
unpack-trees: print "Aborting" to stderr
Michael J Gruber
2011-09-21
|
|
/
*
|
Merge branch 'jc/diff-index-unpack'
Junio C Hamano
2011-10-05
|
\
\
|
*
|
unpack-trees: allow pruning with pathspec
Junio C Hamano
2011-08-29
|
|
/
*
|
Merge branch 'maint'
Junio C Hamano
2011-07-31
|
\
\
|
*
|
Break down no-lstat() condition checks in verify_uptodate()
Nguyễn Thái Ngọc Duy
2011-07-31
|
|
/
*
|
Merge branch 'jc/diff-index-quick-exit-early'
Junio C Hamano
2011-06-29
|
\
\
|
|
/
|
/
|
|
*
diff-index --quiet: learn the "stop feeding the backend early" logic
Junio C Hamano
2011-05-31
*
|
unpack-trees: add the dry_run flag to unpack_trees_options
Jens Lehmann
2011-05-25
*
|
sparse checkout: do not eagerly decide the fate for whole directory
Nguyễn Thái Ngọc Duy
2011-05-10
|
/
*
Fix sparse warnings
Stephen Boyd
2011-03-22
*
Revert "unpack_trees(): skip trees that are the same in all input"
Junio C Hamano
2011-02-15
[next]