Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
ll-merge.c
Age
Commit message (
Expand
)
Author
2023-04-24
treewide: be explicit about dependence on strbuf.h
Elijah Newren
2023-04-11
treewide: be explicit about dependence on convert.h
Elijah Newren
2023-03-21
wrapper.h: move declarations for wrapper.c functions from cache.h
Elijah Newren
2023-01-14
attr: add flag `--source` to work with tree-ish
Karthik Nayak
2022-11-09
Merge branch 'rs/no-more-run-command-v'
Taylor Blau
2022-10-30
use child_process member "args" instead of string array variable
René Scharfe
2022-10-18
ll-merge: mark unused parameters in callbacks
Jeff King
2022-09-01
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
Ævar Arnfjörð Bjarmason
2022-08-19
config: mark unused callback parameters
Jeff King
2022-05-21
Merge branch 'ep/maint-equals-null-cocci'
Junio C Hamano
2022-05-02
tree-wide: apply equals-null.cocci
Junio C Hamano
2022-02-02
ll-merge: make callers responsible for showing warnings
Elijah Newren
2021-06-11
ll_union_merge(): rename path_unused parameter
Jeff King
2021-06-11
ll_union_merge(): pass name labels to ll_xdl_merge()
Jeff King
2021-06-11
ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
Jeff King
2021-03-14
use CALLOC_ARRAY
René Scharfe
2020-04-11
parse_config_key(): return subsection len as size_t
Jeff King
2019-09-04
am: reload .gitattributes after patching it
brian m. carlson
2019-01-05
Merge branch 'en/merge-path-collision'
Junio C Hamano
2018-11-08
merge-recursive: increase marker length with depth of recursion
Elijah Newren
2018-10-19
Merge branch 'nd/the-index'
Junio C Hamano
2018-09-21
ll-merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-13
Make git_check_attr() a void function
Torsten Bögershausen
2018-08-14
attr: remove an implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2017-09-14
avoid "write_in_full(fd, buf, len) != len" pattern
Jeff King
2017-06-25
Merge branch 'ab/free-and-null'
Junio C Hamano
2017-06-25
Merge branch 'bw/config-h'
Junio C Hamano
2017-06-16
coccinelle: make use of the "expression" FREE_AND_NULL() rule
Ævar Arnfjörð Bjarmason
2017-06-15
config: don't include config.h by default
Brandon Williams
2017-06-13
convert: convert renormalize_buffer to take an index
Brandon Williams
2017-02-02
attr: convert git_check_attrs() callers to use the new API
Junio C Hamano
2017-02-02
attr: rename function and struct related to checking attributes
Junio C Hamano
2016-05-18
Merge branch 'jc/ll-merge-internal'
Junio C Hamano
2016-05-10
ll-merge: use a longer conflict marker for internal merge
Junio C Hamano
2016-04-15
ll-merge: fix typo in comment
Junio C Hamano
2016-02-23
use xmallocz to avoid size arithmetic
Jeff King
2015-10-21
Merge branch 'jk/war-on-sprintf'
Junio C Hamano
2015-09-29
Sync with 2.4.10
Junio C Hamano
2015-09-29
xdiff: reject files larger than ~1GB
Jeff King
2015-09-25
convert trivial sprintf / strcpy calls to xsnprintf
Jeff King
2015-06-05
ll-merge: pass the original path to external drivers
Junio C Hamano
2014-08-13
ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`
Tanay Abhra
2013-01-23
convert some config callbacks to parse_config_key
Jeff King
2012-09-15
Merge branch 'jc/ll-merge-binary-ours'
Junio C Hamano
2012-09-12
ll-merge: warn about inability to merge binary files only when we can't
Junio C Hamano
2012-09-09
merge: teach -Xours/-Xtheirs to binary ll-merge driver
Junio C Hamano
2012-05-01
remove superfluous newlines in error messages
Pete Wyckoff
2011-08-05
Rename git_checkattr() to git_check_attr()
Michael Haggerty
2011-01-16
ll-merge: simplify opts == NULL case
Jonathan Nieder
2010-08-26
merge-recursive --patience
Justin Frankel
[next]