index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
combine-diff.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'jk/maint-null-in-trees'
Junio C Hamano
2012-08-27
1
-2
/
+2
|
\
|
*
diff: do not use null sha1 as a sentinel value
Jeff King
2012-07-30
1
-2
/
+2
*
|
Merge branch 'rs/combine-diff-zero-context-at-the-beginning'
Junio C Hamano
2012-04-16
1
-1
/
+1
|
\
\
|
|
/
|
/
|
|
*
combine-diff: fix loop index underflow
René Scharfe
2012-03-26
1
-1
/
+1
*
|
pass struct commit to diff_tree_combined_merge()
René Scharfe
2011-12-18
1
-4
/
+3
*
|
use struct sha1_array in diff_tree_combined()
René Scharfe
2011-12-18
1
-21
/
+13
*
|
Merge branch 'jk/color-and-pager'
Junio C Hamano
2011-08-29
1
-4
/
+3
|
\
\
|
*
|
diff: refactor COLOR_DIFF from a flag into an int
Jeff King
2011-08-18
1
-4
/
+3
*
|
|
Merge branch 'jc/combine-diff-callback'
Junio C Hamano
2011-08-29
1
-0
/
+69
|
\
\
\
|
*
|
|
combine-diff: support format_callback
Junio C Hamano
2011-08-21
1
-0
/
+69
*
|
|
|
Merge branch 'jc/maint-combined-diff-work-tree'
Junio C Hamano
2011-08-18
1
-4
/
+10
|
\
\
\
\
|
|
_
|
/
/
|
/
|
|
|
|
*
|
|
diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
Junio C Hamano
2011-08-04
1
-4
/
+10
|
*
|
|
Merge branch 'rs/diff-no-minimal' into maint
Junio C Hamano
2010-06-21
1
-1
/
+1
|
|
\
\
\
*
|
|
|
|
combine-diff: respect textconv attributes
Jeff King
2011-05-24
1
-9
/
+32
*
|
|
|
|
combine-diff: handle binary files as binary
Jeff King
2011-05-24
1
-2
/
+35
*
|
|
|
|
combine-diff: calculate mode_differs earlier
Jeff King
2011-05-24
1
-2
/
+7
*
|
|
|
|
combine-diff: split header printing into its own function
Jeff King
2011-05-24
1
-61
/
+74
|
|
_
|
/
/
|
/
|
|
|
*
|
|
|
Merge branch 'rs/diff-no-minimal'
Junio C Hamano
2010-06-13
1
-1
/
+1
|
\
\
\
\
|
|
/
/
/
|
/
|
/
/
|
|
/
/
|
*
|
git diff too slow for a file
René Scharfe
2010-05-02
1
-1
/
+1
*
|
|
remove ecb parameter from xdi_diff_outf()
René Scharfe
2010-05-05
1
-2
/
+1
|
/
/
*
|
combined diff: correctly handle truncated file
Thomas Rast
2010-04-17
1
-6
/
+8
*
|
Give the hunk comment its own color
Bert Wesarg
2009-11-28
1
-1
/
+4
*
|
Merge branch 'maint'
Junio C Hamano
2009-07-23
1
-15
/
+14
|
\
\
|
*
|
diff --cc: a lost line at the beginning of the file is shown incorrectly
Junio C Hamano
2009-07-23
1
-7
/
+9
|
*
|
combine-diff.c: fix performance problem when folding common deleted lines
Junio C Hamano
2009-07-23
1
-8
/
+5
*
|
|
Use die_errno() instead of die() when checking syscalls
Thomas Rast
2009-06-27
1
-1
/
+1
|
/
/
*
|
Fix a bunch of pointer declarations (codestyle)
Felipe Contreras
2009-05-02
1
-2
/
+2
*
|
Merge branch 'maint'
Junio C Hamano
2009-04-30
1
-9
/
+25
|
\
\
|
*
\
Merge branch 'maint-1.6.0' into maint-1.6.1
Junio C Hamano
2009-04-29
1
-12
/
+26
|
|
\
\
|
|
*
|
diff -c -p: do not die on submodules
Junio C Hamano
2009-04-29
1
-12
/
+26
*
|
|
|
Merge branch 'kb/checkout-optim'
Junio C Hamano
2009-03-18
1
-3
/
+1
|
\
\
\
\
|
*
|
|
|
show_patch_diff(): remove a call to fstat()
Kjetil Barvik
2009-02-10
1
-3
/
+1
|
|
/
/
/
*
/
/
/
Move local variables to narrower scopes
Benjamin Kramer
2009-03-08
1
-2
/
+1
|
/
/
/
*
|
|
combine-diff.c: use strbuf_readlink()
Junio C Hamano
2008-12-17
1
-5
/
+5
*
|
|
Always initialize xpparam_t to 0
Brian Downing
2008-10-25
1
-0
/
+1
*
|
|
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
Brandon Casey
2008-10-12
1
-2
/
+1
*
|
|
Merge branch 'jc/diff-prefix'
Junio C Hamano
2008-09-19
1
-2
/
+6
|
\
\
\
|
*
|
|
diff: vary default prefix depending on what are compared
Junio C Hamano
2008-08-31
1
-2
/
+6
*
|
|
|
Merge branch 'jc/hide-cr-in-diff-from-less'
Junio C Hamano
2008-09-08
1
-2
/
+14
|
\
\
\
\
|
|
|
/
/
|
|
/
|
|
|
*
|
|
diff: Help "less" hide ^M from the output
Junio C Hamano
2008-08-31
1
-2
/
+14
|
|
/
/
*
|
|
Merge branch 'maint' to sync with 1.6.0.1
Junio C Hamano
2008-08-24
1
-0
/
+12
|
\
|
|
|
*
|
Respect core.autocrlf in combined diff
Alexander Gavrilov
2008-08-24
1
-0
/
+12
*
|
|
xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
Junio C Hamano
2008-08-14
1
-5
/
+2
*
|
|
Make xdi_diff_outf interface for running xdiff_outf diffs
Brian Downing
2008-08-14
1
-3
/
+2
|
/
/
*
|
Merge branch 'jc/maint-combine-diff-pre-context'
Junio C Hamano
2008-06-22
1
-2
/
+5
|
\
\
|
*
|
diff -c/--cc: do not include uninteresting deletion before leading context
Junio C Hamano
2008-06-19
1
-2
/
+5
*
|
|
Cleanup xread() loops to use read_in_full()
Heikki Orsila
2008-05-04
1
-9
/
+8
*
|
|
Remove dead code: show_log() sep argument and diff_options.msg_sep
Adam Simpkins
2008-05-03
1
-3
/
+3
*
|
|
Die for an early EOF in a file reading loop
Heikki Orsila
2008-04-28
1
-3
/
+3
|
/
/
*
|
Fix rewrite_diff() name quoting.
Junio C Hamano
2007-12-27
1
-10
/
+1
[next]