Sign in
googlers
/
jrn
/
git
/
15664a5f35b6db8077e3e8aeb377e72f0f95e23e
/
builtin
/
merge-file.c
517fe80
assert NOARG/NONEG behavior of parse-options callbacks
by Jeff King
· 6 years ago
b2141fc
config: don't include config.h by default
by Brandon Williams
· 8 years ago
e4da43b
prefix_filename: return newly allocated string
by Jeff King
· 8 years ago
116fb64
prefix_filename: drop length parameter
by Jeff King
· 8 years ago
62f94d5
builtin/merge-file.c: use error_errno()
by Nguyễn Thái Ngọc Duy
· 9 years ago
54bc414
Merge branch 'jk/merge-file-exit-code'
by Junio C Hamano
· 9 years ago
e34f802
merge-file: clamp exit code to maximum 127
by Jeff King
· 9 years ago
6343e2f
Sync with 2.3.10
by Junio C Hamano
· 9 years ago
83c4d38
merge-file: enforce MAX_XDIFF_SIZE on incoming files
by Jeff King
· 9 years ago
f11f76b
Merge branch 'ab/merge-file-prefix'
by Junio C Hamano
· 10 years ago
204a8ff
merge-file: correctly open files when in a subdir
by Aleksander Boruch-Gruszecki
· 10 years ago
9c9b4f2
standardize usage info string format
by Alex Henrie
· 10 years ago
d5d09d4
Replace deprecated OPT_BOOLEAN by OPT_BOOL
by Stefan Beller
· 11 years ago
c7d93da
i18n: merge-file: mark parseopt strings for translation
by Nguyễn Thái Ngọc Duy
· 12 years ago
82247e9
remove superfluous newlines in error messages
by Pete Wyckoff
· 13 years ago
20f84c8
Merge branch 'rs/opt-help-text'
by Junio C Hamano
· 14 years ago
8c83968
Describe various forms of "be quiet" using OPT__QUIET
by Jonathan Nieder
· 14 years ago
d52ee6e
add description parameter to OPT__QUIET
by René Scharfe
· 14 years ago
55846b9
merge-file: correctly find files when called in subdir
by Thomas Rast
· 14 years ago
3668d42
merge-file: run setup_git_directory_gently() sooner
by Nguyễn Thái Ngọc Duy
· 14 years ago
39b5977
Merge branch 'rs/diff-no-minimal'
by Junio C Hamano
· 15 years ago
4bb0936
merge-file --diff3: add a label for ancestor
by Jonathan Nieder
· 15 years ago
a4b5e91
xdl_merge(): move file1 and file2 labels to xmparam structure
by Jonathan Nieder
· 15 years ago
2bb76e1
Merge branch 'bw/union-merge-refactor'
by Junio C Hamano
· 15 years ago
81b50f3
Move 'builtin-*' into a 'builtin/' subdirectory
by Linus Torvalds
· 15 years ago
[Renamed from builtin-merge-file.c]
06dbc1e
Merge branch 'jc/conflict-marker-size'
by Junio C Hamano
· 15 years ago
00f8f97
xdl_merge(): introduce xmparam_t for merge specific parameters
by Junio C Hamano
· 15 years ago
73eb40e
git-merge-file --ours, --theirs
by Junio C Hamano
· 17 years ago
3778292
parse-opts: prepare for OPT_FILENAME
by Stephen Boyd
· 16 years ago
4deba8b
merge-file: handle freopen() failure
by René Scharfe
· 16 years ago
d249610
parse-opt: migrate builtin-merge-file.
by Pierre Habouzit
· 16 years ago
b541248
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
by Junio C Hamano
· 16 years ago
8313374
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
by Junio C Hamano
· 16 years ago
e0af48e
xdiff-merge: optionally show conflicts in "diff3 -m" style
by Junio C Hamano
· 16 years ago
16007f3
Merge branch 'maint'
by Junio C Hamano
· 17 years ago
381b851
merge-file: handle empty files gracefully
by Johannes Schindelin
· 17 years ago
ee95ec5
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
by Johannes Schindelin
· 17 years ago
baffc0e
Make every builtin-*.c file #include "builtin.h"
by Peter Hagervall
· 18 years ago
5771907
git-merge-file: refuse to merge binary files
by Johannes Schindelin
· 18 years ago
7cab588
move read_mmfile() into xdiff-interface
by Johannes Schindelin
· 18 years ago
fbe0b24
merge-file: support -p and -q; fix compile warnings
by Johannes Schindelin
· 18 years ago
ba1f5f3
Add builtin merge-file, a minimal replacement for RCS merge
by Johannes Schindelin
· 18 years ago