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
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
2009-07-06
Merge branch 'tr/die_errno'
Junio C Hamano
2009-07-05
run_command: return exit code as positive value
Johannes Sixt
2009-07-02
Remove filename from conflict markers
Martin Renold
2009-06-27
Use die_errno() instead of die() when checking syscalls
Thomas Rast
2009-06-21
Merge branch 'sb/maint-1.6.0-add-config-fix'
Junio C Hamano
2009-06-15
use xstrdup, not strdup in ll-merge.c
Jim Meyering
2009-06-09
Simplify some instances of run_command() by using run_command_v_opt().
Johannes Sixt
2009-04-30
replace direct calls to unlink(2) with unlink_or_warn
Alex Riesen
2008-11-24
merge-recursive: use strbuf_expand() instead of interpolate()
René Scharfe
2008-08-31
git-merge-recursive: learn to honor merge.conflictstyle
Junio C Hamano
2008-05-14
Provide git_config with a callback-data parameter
Johannes Schindelin
2008-02-18
merge-recursive: split low-level merge functions out.
Junio C Hamano