summaryrefslogtreecommitdiff
path: root/diff-lib.c
AgeCommit message (Expand)AuthorFilesLines
2008-05-05Merge branch 'jc/lstat'Libravatar Junio C Hamano1-2/+5
2008-04-29git-svn: detect and fail gracefully when dcommitting to a voidLibravatar Matthieu Moy1-0/+3
2008-04-12diff-files: mark an index entry we know is up-to-date as suchLibravatar Junio C Hamano1-2/+5
2008-03-30diff-files: careful when inspecting work tree itemsLibravatar Junio C Hamano1-6/+11
2008-03-30diff-index: careful when inspecting work tree itemsLibravatar Junio C Hamano1-14/+55
2008-03-10unpack_trees(): fix diff-index regression.Libravatar Linus Torvalds1-0/+18
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-41/+8
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-0/+2
2008-03-02diff-lib.c: constness strengtheningLibravatar Junio C Hamano1-7/+6
2008-02-09Allow callers of unpack_trees() to handle failureLibravatar Daniel Barkalow1-2/+4
2008-01-21Also use unpack_trees() in do_diff_cache()Libravatar Johannes Schindelin1-79/+13
2008-01-21Make run_diff_index() use unpack_trees(), not read_tree()Libravatar Linus Torvalds1-14/+137
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-18/+14
2007-11-26Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.cLibravatar Steffen Prohaska1-1/+1
2007-11-18Merge branch 'ph/diffopts'Libravatar Junio C Hamano1-11/+13
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Libravatar Pierre Habouzit1-11/+13
2007-11-10git-add: make the entry stat-clean after re-adding the same contentsLibravatar Junio C Hamano1-1/+3
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityLibravatar Junio C Hamano1-7/+9
2007-09-14diff --no-index: do not forget to run diff_setup_done()Libravatar Junio C Hamano1-0/+2
2007-08-14diff: squelch empty diffs even moreLibravatar René Scharfe1-2/+6
2007-07-07diff-lib.c: don't strdup twiceLibravatar René Scharfe1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+1
2007-04-21Merge branch 'lt/gitlink'Libravatar Junio C Hamano1-12/+3
2007-04-13Do not default to --no-index when given two directories.Libravatar Junio C Hamano1-10/+26
2007-04-09diff-lib: use ce_mode_from_stat() rather than messing with modes manuallyLibravatar Linus Torvalds1-12/+3
2007-03-14Teach --quiet to diff backends.Libravatar Junio C Hamano1-0/+6
2007-03-14Allow git-diff exit with codes similar to diff(1)Libravatar Alex Riesen1-1/+4
2007-03-10Merge branch 'js/diff-ni'Libravatar Junio C Hamano1-15/+27
2007-03-04Merge branch 'js/symlink'Libravatar Junio C Hamano1-0/+3
2007-03-04diff --no-index: support /dev/null as filenameLibravatar Johannes Schindelin1-17/+17
2007-03-04diff-ni: fix the diff with standard inputLibravatar Junio C Hamano1-5/+11
2007-03-03diff: support reading a file from stdin via "-"Libravatar Johannes Schindelin1-5/+11
2007-03-03diff-ni: allow running from a subdirectory.Libravatar Junio C Hamano1-1/+13
2007-03-02Add core.symlinks to mark filesystems that do not support symbolic links.Libravatar Johannes Sixt1-0/+3
2007-02-28diff: make more cases implicit --no-indexLibravatar Johannes Schindelin1-0/+54
2007-02-26diff --no-index: also imitate the exit status of diff(1)Libravatar Johannes Schindelin1-3/+8
2007-02-26Merge branch 'master' into js/diff-niLibravatar Junio C Hamano1-3/+13
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Libravatar Junio C Hamano1-3/+13
2007-02-25Fix typo: do not show name1 when name2 failsLibravatar Johannes Schindelin1-1/+1
2007-02-24Evil Merge branch 'jc/status' (early part) into js/diff-niLibravatar Junio C Hamano1-9/+5
2007-02-22Teach git-diff-files the new option `--no-index`Libravatar Johannes Schindelin1-0/+207
2007-02-22run_diff_{files,index}(): update calling convention.Libravatar Junio C Hamano1-9/+1
2007-02-16Do not take mode bits from index after type change.Libravatar Junio C Hamano1-3/+1
2007-02-05git-blame: no rev means start from the working tree file.Libravatar Junio C Hamano1-1/+43
2007-01-06diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Libravatar Junio C Hamano1-3/+6
2006-09-05diff-index --cc shows a 3-way diff between HEAD, index and working tree.Libravatar Paul Mackerras1-0/+25
2006-08-23Convert memset(hash,0,20) to hashclr(hash).Libravatar Junio C Hamano1-1/+1
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Libravatar Shawn Pearce1-2/+1
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.Libravatar David Rientjes1-1/+1
2006-06-19Merge branch 'lt/objlist' into nextLibravatar Junio C Hamano1-2/+2