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
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
2010-08-26
ll-merge: replace flag argument with options struct
Jonathan Nieder
2010-08-06
ll-merge: let caller decide whether to renormalize
Jonathan Nieder
2010-08-06
ll-merge: make flag easier to populate
Jonathan Nieder
2010-07-03
Avoid conflicts when merging branches with mixed normalization
Eyvind Bernhardsen
2010-06-01
Rewrite dynamic structure initializations to runtime assignment
Gary V. Vaughan
2010-03-21
ll_merge(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-03-21
xdl_merge(): move file1 and file2 labels to xmparam structure
Jonathan Nieder
2010-03-02
refactor merge flags into xmparam_t
Bert Wesarg
2010-03-02
make union merge an xdl merge favor
Bert Wesarg
2010-01-21
Merge branch 'jc/conflict-marker-size'
Junio C Hamano
2010-01-21
Merge branch 'ap/merge-backend-opts'
Junio C Hamano
2010-01-18
git merge -X<option>
Avery Pennarun
2010-01-17
rerere: honor conflict-marker-size attribute
Junio C Hamano
2010-01-17
conflict-marker-size: new attribute
Junio C Hamano
2010-01-17
xdl_merge(): introduce xmparam_t for merge specific parameters
Junio C Hamano
2010-01-17
git_attr(): fix function signature
Junio C Hamano
2010-01-06
run-command: convert simple callsites to use_shell
Jeff King
2009-08-11
Merge branch 'js/run-command-updates'
Junio C Hamano
[next]