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
/
builtin
/
merge-file.c
Age
Commit message (
Expand
)
Author
2023-06-21
cache.h: remove this no-longer-used header
Elijah Newren
2023-03-21
setup.h: move declarations for setup.c functions from cache.h
Elijah Newren
2023-03-21
abspath.h: move absolute path functions from cache.h
Elijah Newren
2023-03-21
treewide: be explicit about dependence on gettext.h
Elijah Newren
2022-07-01
merge-file: fix memory leaks on error path
Ævar Arnfjörð Bjarmason
2022-07-01
merge-file: refactor for subsequent memory leak fix
Ævar Arnfjörð Bjarmason
2021-12-02
xdiff: implement a zealous diff3, or "zdiff3"
Phillip Wood
2018-11-06
assert NOARG/NONEG behavior of parse-options callbacks
Jeff King
2017-06-15
config: don't include config.h by default
Brandon Williams
2017-03-21
prefix_filename: return newly allocated string
Jeff King
2017-03-21
prefix_filename: drop length parameter
Jeff King
2016-05-09
builtin/merge-file.c: use error_errno()
Nguyễn Thái Ngọc Duy
2015-10-30
Merge branch 'jk/merge-file-exit-code'
Junio C Hamano
2015-10-29
merge-file: clamp exit code to maximum 127
Jeff King
2015-09-29
Sync with 2.3.10
Junio C Hamano
2015-09-29
merge-file: enforce MAX_XDIFF_SIZE on incoming files
Jeff King
2015-02-22
Merge branch 'ab/merge-file-prefix'
Junio C Hamano
2015-02-11
merge-file: correctly open files when in a subdir
Aleksander Boruch-Gruszecki
2015-01-14
standardize usage info string format
Alex Henrie
2013-08-05
Replace deprecated OPT_BOOLEAN by OPT_BOOL
Stefan Beller
2012-08-20
i18n: merge-file: mark parseopt strings for translation
Nguyễn Thái Ngọc Duy
2012-05-01
remove superfluous newlines in error messages
Pete Wyckoff
2010-11-25
Merge branch 'rs/opt-help-text'
Junio C Hamano
2010-11-15
Describe various forms of "be quiet" using OPT__QUIET
Jonathan Nieder
2010-11-15
add description parameter to OPT__QUIET
René Scharfe
2010-10-19
merge-file: correctly find files when called in subdir
Thomas Rast
2010-08-16
merge-file: run setup_git_directory_gently() sooner
Nguyễn Thái Ngọc Duy
2010-06-13
Merge branch 'rs/diff-no-minimal'
Junio C Hamano
2010-03-21
merge-file --diff3: add a label for ancestor
Jonathan Nieder
2010-03-21
xdl_merge(): move file1 and file2 labels to xmparam structure
Jonathan Nieder
2010-03-20
Merge branch 'bw/union-merge-refactor'
Junio C Hamano
2010-02-23
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds