Sign in
googlers
/
jrn
/
git
/
5d4d1440ba992fe27b00f8a56862543bb27561e2
/
combine-diff.c
a1ddd11
Merge branch 'cb/log-follow-with-combined'
by Junio C Hamano
· 12 years ago
edc7f0a
Merge branch 'mk/combine-diff-context-horizon-fix'
by Junio C Hamano
· 12 years ago
46ec510
fix segfault with git log -c --follow
by Clemens Buchacher
· 12 years ago
aac3857
combine-diff.c: Fix output when changes are exactly 3 lines apart
by Matthijs Kooijman
· 12 years ago
99d3206
combine-diff: coalesce lost lines optimally
by Antoine Pelisse
· 12 years ago
fa04ae0
Allow combined diff to ignore white-spaces
by Antoine Pelisse
· 12 years ago
a1d68be
Merge branch 'jk/diff-graph-cleanup'
by Junio C Hamano
· 12 years ago
41ee2ad
combine-diff.c: teach combined diffs about line prefix
by John Keeping
· 12 years ago
7766705
combine-diff: lift 32-way limit of combined diff
by Junio C Hamano
· 12 years ago
03adeea
Merge branch 'jk/maint-null-in-trees' into maint-1.7.11
by Junio C Hamano
· 13 years ago
3b75314
Merge branch 'jk/maint-null-in-trees'
by Junio C Hamano
· 13 years ago
e545010
diff: do not use null sha1 as a sentinel value
by Jeff King
· 13 years ago
f84e8b6
Merge branch 'rs/combine-diff-zero-context-at-the-beginning'
by Junio C Hamano
· 13 years ago
e5e9b56
combine-diff: fix loop index underflow
by René Scharfe
· 13 years ago
8288929
pass struct commit to diff_tree_combined_merge()
by René Scharfe
· 13 years ago
0041f09
use struct sha1_array in diff_tree_combined()
by René Scharfe
· 13 years ago
f946b46
Merge branch 'jk/color-and-pager'
by Junio C Hamano
· 14 years ago
e78f829
Merge branch 'jc/combine-diff-callback'
by Junio C Hamano
· 14 years ago
25e5e2b
combine-diff: support format_callback
by Junio C Hamano
· 14 years ago
f1c9626
diff: refactor COLOR_DIFF from a flag into an int
by Jeff King
· 14 years ago
660578d
Merge branch 'jc/maint-combined-diff-work-tree'
by Junio C Hamano
· 14 years ago
9969454
diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
by Junio C Hamano
· 14 years ago
0508fe5
combine-diff: respect textconv attributes
by Jeff King
· 14 years ago
4d5f347
combine-diff: handle binary files as binary
by Jeff King
· 14 years ago
c95b99b
combine-diff: calculate mode_differs earlier
by Jeff King
· 14 years ago
7c978a0
combine-diff: split header printing into its own function
by Jeff King
· 14 years ago
6033553
Merge branch 'rs/diff-no-minimal' into maint
by Junio C Hamano
· 15 years ago
39b5977
Merge branch 'rs/diff-no-minimal'
by Junio C Hamano
· 15 years ago
dfea790
remove ecb parameter from xdi_diff_outf()
by René Scharfe
· 15 years ago
582aa00
git diff too slow for a file
by René Scharfe
· 15 years ago
2179870
combined diff: correctly handle truncated file
by Thomas Rast
· 15 years ago
89cb73a
Give the hunk comment its own color
by Bert Wesarg
· 15 years ago
248b6c0
Merge branch 'maint'
by Junio C Hamano
· 16 years ago
b810cbb
diff --cc: a lost line at the beginning of the file is shown incorrectly
by Junio C Hamano
· 16 years ago
55d5d5b
combine-diff.c: fix performance problem when folding common deleted lines
by Junio C Hamano
· 16 years ago
0721c31
Use die_errno() instead of die() when checking syscalls
by Thomas Rast
· 16 years ago
4b25d09
Fix a bunch of pointer declarations (codestyle)
by Felipe Contreras
· 16 years ago
d1c8c0c
Merge branch 'maint'
by Junio C Hamano
· 16 years ago
9347473
Merge branch 'maint-1.6.0' into maint-1.6.1
by Junio C Hamano
· 16 years ago
7dae8b2
diff -c -p: do not die on submodules
by Junio C Hamano
· 16 years ago
a9bfe81
Merge branch 'kb/checkout-optim'
by Junio C Hamano
· 16 years ago
fd13b21
Move local variables to narrower scopes
by Benjamin Kramer
· 16 years ago
91fcbcb
show_patch_diff(): remove a call to fstat()
by Kjetil Barvik
· 16 years ago
912342d
combine-diff.c: use strbuf_readlink()
by Junio C Hamano
· 16 years ago
9ccd0a8
Always initialize xpparam_t to 0
by Brian Downing
· 16 years ago
f285a2d
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
by Brandon Casey
· 16 years ago
e69a6f4
Merge branch 'jc/diff-prefix'
by Junio C Hamano
· 16 years ago
fdfb4cf
Merge branch 'jc/hide-cr-in-diff-from-less'
by Junio C Hamano
· 17 years ago
a5a818e
diff: vary default prefix depending on what are compared
by Junio C Hamano
· 17 years ago
3928097
diff: Help "less" hide ^M from the output
by Junio C Hamano
· 17 years ago
49d3536
Merge branch 'maint' to sync with 1.6.0.1
by Junio C Hamano
· 17 years ago
5e568f9
Respect core.autocrlf in combined diff
by Alexander Gavrilov
· 17 years ago
8a3f524
xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
by Junio C Hamano
· 17 years ago
c99db9d2
Make xdi_diff_outf interface for running xdiff_outf diffs
by Brian Downing
· 17 years ago
bc9c3e0
Merge branch 'jc/maint-combine-diff-pre-context'
by Junio C Hamano
· 17 years ago
c86fbe5
diff -c/--cc: do not include uninteresting deletion before leading context
by Junio C Hamano
· 17 years ago
c697ad1
Cleanup xread() loops to use read_in_full()
by Heikki Orsila
· 17 years ago
0286565
Remove dead code: show_log() sep argument and diff_options.msg_sep
by Adam Simpkins
· 17 years ago
f0ec47b
Die for an early EOF in a file reading loop
by Heikki Orsila
· 17 years ago
d562509
Fix rewrite_diff() name quoting.
by Junio C Hamano
· 17 years ago
462a15b
combine-diff: Fix path quoting
by Junio C Hamano
· 17 years ago
c279d7e
xdl_diff: identify call sites.
by Junio C Hamano
· 17 years ago
8f67f8a
Make the diff_options bitfields be an unsigned with explicit masks.
by Pierre Habouzit
· 17 years ago
663af34
Full rework of quote_c_style and write_name_quoted.
by Pierre Habouzit
· 17 years ago
30b2501
Future-proof source for changes in xdemitconf_t
by Johannes Schindelin
· 18 years ago
8a912bc
Ensure return value from xread() is always stored into an ssize_t
by Johan Herland
· 18 years ago
f1af60b
Support 'diff=pgm' attribute
by Junio C Hamano
· 18 years ago
dc49cd7
Cast 64 bit off_t to 32 bit size_t
by Shawn O. Pearce
· 18 years ago
a249a9b
Tell multi-parent diff about core.symlinks.
by Johannes Sixt
· 18 years ago
21666f1
convert object type handling from a string to a number
by Nicolas Pitre
· 18 years ago
ee24ee5
diff --cc: integer overflow given a 2GB-or-larger file
by Jim Meyering
· 18 years ago
4fc970c
diff --cc: fix display of symlink conflicts during a merge.
by Junio C Hamano
· 18 years ago
3b0f5e8
combine-diff: special case --unified=0
by Junio C Hamano
· 18 years ago
af70fa4
Merge branch 'jc/combined'
by Junio C Hamano
· 18 years ago
4415278
combine-diff: honour --no-commit-id
by Junio C Hamano
· 18 years ago
7a8ac59
combine-diff: fix hunk_comment_line logic.
by Junio C Hamano
· 18 years ago
e893f7a
Merge branch 'jc/combined'
by Junio C Hamano
· 18 years ago
d5f6a01
combine-diff: a few more finishing touches.
by Junio C Hamano
· 18 years ago
74e2abe
diff --numstat
by Junio C Hamano
· 18 years ago
e702496
Convert memcpy(a,b,20) to hashcpy(a,b).
by Shawn Pearce
· 19 years ago
a89fccd
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
by David Rientjes
· 19 years ago
0bef57e
make inline is_null_sha1 global
by David Rientjes
· 19 years ago
a976b0a
Remove combine-diff.c::uninteresting()
by Junio C Hamano
· 19 years ago
89b0c4b
Fix type of combine-diff.c::show_patch_diff()
by Junio C Hamano
· 19 years ago
567a03d
combine-diff: use color
by Junio C Hamano
· 19 years ago
28f7581
Substitute xmalloc()+memset(0) with xcalloc().
by Peter Eriksen
· 19 years ago
82e5a82
Fix more typos, primarily in the code
by Pavel Roskin
· 19 years ago
0c926a3
Merge branch 'th/diff'
by Junio C Hamano
· 19 years ago
2c0b4df
combine-diff.c: type sanity.
by Junio C Hamano
· 19 years ago
2386c29
combine-diff.c: type sanity
by Junio C Hamano
· 19 years ago
3969cf7
Fix some more diff options changes.
by Junio C Hamano
· 19 years ago
39bc9a6
Add msg_sep to diff_options
by Timo Hirvonen
· 19 years ago
c674434
Merge with_raw, with_stat and summary variables to output_format
by Timo Hirvonen
· 19 years ago
ee1e541
git diff: support "-U" and "--unified" options properly
by Linus Torvalds
· 19 years ago
0fe7c1d
built-in diff: assorted updates.
by Junio C Hamano
· 19 years ago
34e98ea
Merge branch 'lt/logopt'
by Junio C Hamano
· 19 years ago
965f803
combine-diff: show diffstat with the first parent.
by Junio C Hamano
· 19 years ago
eab144a
Log message printout cleanups (#2)
by Linus Torvalds
· 19 years ago
9153983
Log message printout cleanups
by Linus Torvalds
· 19 years ago
310f8b5
cleanups: Remove unused vars from combine-diff.c
by Serge E. Hallyn
· 19 years ago
Next »