index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
builtin
/
merge-file.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
global: mark code units that generate warnings with `-Wsign-compare`
Patrick Steinhardt
2024-12-06
1
-0
/
+2
*
builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
John Cai
2024-09-13
1
-0
/
+1
*
builtin: add a repository parameter for builtin functions
John Cai
2024-09-13
1
-1
/
+4
*
merge-file: add --diff-algorithm option
Antonin Delpeuch
2023-11-22
1
-0
/
+28
*
merge-file: add an option to process object IDs
brian m. carlson
2023-11-02
1
-17
/
+47
*
cache.h: remove this no-longer-used header
Elijah Newren
2023-06-21
1
-1
/
+0
*
setup.h: move declarations for setup.c functions from cache.h
Elijah Newren
2023-03-21
1
-0
/
+1
*
abspath.h: move absolute path functions from cache.h
Elijah Newren
2023-03-21
1
-0
/
+1
*
treewide: be explicit about dependence on gettext.h
Elijah Newren
2023-03-21
1
-0
/
+1
*
merge-file: fix memory leaks on error path
Ævar Arnfjörð Bjarmason
2022-07-01
1
-4
/
+6
*
merge-file: refactor for subsequent memory leak fix
Ævar Arnfjörð Bjarmason
2022-07-01
1
-12
/
+14
*
xdiff: implement a zealous diff3, or "zdiff3"
Phillip Wood
2021-12-01
1
-0
/
+2
*
assert NOARG/NONEG behavior of parse-options callbacks
Jeff King
2018-11-06
1
-0
/
+2
*
config: don't include config.h by default
Brandon Williams
2017-06-15
1
-0
/
+1
*
prefix_filename: return newly allocated string
Jeff King
2017-03-21
1
-3
/
+11
*
prefix_filename: drop length parameter
Jeff King
2017-03-21
1
-6
/
+2
*
builtin/merge-file.c: use error_errno()
Nguyễn Thái Ngọc Duy
2016-05-09
1
-5
/
+5
*
Merge branch 'jk/merge-file-exit-code'
Junio C Hamano
2015-10-30
1
-0
/
+3
|
\
|
*
merge-file: clamp exit code to maximum 127
Jeff King
2015-10-29
1
-0
/
+3
*
|
Sync with 2.3.10
Junio C Hamano
2015-09-29
1
-1
/
+2
|
\
\
|
*
|
merge-file: enforce MAX_XDIFF_SIZE on incoming files
Jeff King
2015-09-28
1
-1
/
+2
*
|
|
Merge branch 'ab/merge-file-prefix'
Junio C Hamano
2015-02-22
1
-1
/
+2
|
\
|
|
|
*
|
merge-file: correctly open files when in a subdir
Aleksander Boruch-Gruszecki
2015-02-11
1
-1
/
+2
|
|
/
*
/
standardize usage info string format
Alex Henrie
2015-01-14
1
-2
/
+2
|
/
*
Replace deprecated OPT_BOOLEAN by OPT_BOOL
Stefan Beller
2013-08-05
1
-1
/
+1
*
i18n: merge-file: mark parseopt strings for translation
Nguyễn Thái Ngọc Duy
2012-08-20
1
-10
/
+10
*
remove superfluous newlines in error messages
Pete Wyckoff
2012-05-01
1
-2
/
+2
*
Merge branch 'rs/opt-help-text'
Junio C Hamano
2010-11-25
1
-1
/
+1
|
\
|
*
Describe various forms of "be quiet" using OPT__QUIET
Jonathan Nieder
2010-11-15
1
-1
/
+1
|
*
add description parameter to OPT__QUIET
René Scharfe
2010-11-15
1
-1
/
+1
*
|
merge-file: correctly find files when called in subdir
Thomas Rast
2010-10-19
1
-1
/
+6
|
/
*
merge-file: run setup_git_directory_gently() sooner
Nguyễn Thái Ngọc Duy
2010-08-16
1
-3
/
+1
*
Merge branch 'rs/diff-no-minimal'
Junio C Hamano
2010-06-13
1
-1
/
+1
*
merge-file --diff3: add a label for ancestor
Jonathan Nieder
2010-03-21
1
-0
/
+1
*
xdl_merge(): move file1 and file2 labels to xmparam structure
Jonathan Nieder
2010-03-21
1
-2
/
+3
*
Merge branch 'bw/union-merge-refactor'
Junio C Hamano
2010-03-20
1
-9
/
+14
*
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds
2010-02-22
1
-0
/
+96