Commits

Author Commit Message Labels Comments Date
Petr Baudis
Improve the git-diff-tree -c/-cc documentation This tries to clarify the -c/-cc documentation and clean up the style and grammar. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/diff' into next * jc/diff: git log [diff-tree options]... log-tree: separate major part of diff-tree.
Junio C Hamano
git log [diff-tree options]... And this makes "git log" to take common diff-tree options, so that it can be used as "git whatchanged". The recent revision walker updates by Linus to make path limiting low-latency helps this quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
log-tree: separate major part of diff-tree. This separates out the part that deals with one-commit diff-tree (and --stdin form) into a separate log-tree module. There are two goals with this. The more important one is to be able to make this part available to "git log --diff", so that we can have a native "git whatchanged" command. Another is to simplify the commit log generation part simpler. Signed-off-by: Junio C Hamano <junkio@cox.n…
Linus Torvalds
Make "--parents" logs also be incremental The parent rewriting feature caused us to create the whole history in one go, and then simplify it later, because of how rewrite_parents() had been written. However, with a little tweaking, it's perfectly possible to do even that one incrementally. Right now, this doesn't really much matter, because every user of "--parents" will probably generally _also_ use "--topo-order", which will cause the …
Marco Roeland
xdiff/xdiffi.c: fix warnings about possibly uninitialized variables Compiling this module gave the following warnings (some double dutch!): xdiff/xdiffi.c: In functie 'xdl_recs_cmp': xdiff/xdiffi.c:298: let op: 'spl.i1' may be used uninitialized in this function xdiff/xdiffi.c:298: let op: 'spl.i2' may be used uninitialized in this function xdiff/xdiffi.c:219: let op: 'fbest1' may be used uninitialized in this function xdiff/xdiffi.c:219: let op: 'bbest1' may be …
Junio C Hamano
diffcore-rename: fix merging back a broken pair. When a broken pair is matched up by rename detector to be merged back, we do not want to say it is "dissimilar" with the similarity index. The output should just say they were changed, taking the break score left by the earlier diffcore-break run if any. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
diff: fix output of total-rewrite diff. We did not read in the file data before emitting the total-rewrite diff. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-log: match rev-list --abbrev and --abbrev-commit Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'master' into next * master: GIT 1.3.0-rc3
Junio C Hamano
GIT 1.3.0-rc3 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'kh/svn' * kh/svn: git-svnimport: Don't assume that copied files haven't changed
Junio C Hamano
Merge branch 'jc/thinpack' * jc/thinpack: Thin pack generation: optimization.
Junio C Hamano
Merge branch 'jc/date' * jc/date: date parsing: be friendlier to our European friends.
Junio C Hamano
Merge branch 'nh/http' * nh/http: Fix compile with expat, but an old curl version http-fetch: add optional DAV-based pack list
Junio C Hamano
Merge branch 'ew/rev-abbrev' * ew/rev-abbrev: rev-list --abbrev-commit
Junio C Hamano
Merge branch 'jc/blame' * jc/blame: blame -S <ancestry-file> Match ofs/cnt types in diff interface. blame: use built-in xdiff combine-diff: move the code to parse hunk-header into common library. combine-diff: refactor built-in xdiff interface. combine-diff: use built-in xdiff.
Junio C Hamano
Merge branch 'master' into next * master: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk
Junio C Hamano
Merge branch 'maint' * maint: count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully
Junio C Hamano
count-delta: match get_delta_hdr_size() changes. Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre
check patch_delta bounds more carefully Let's avoid going south with invalid delta data. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/thinpack' into next * jc/thinpack: Thin pack generation: optimization.
Junio C Hamano
Merge branch 'ew/rev-abbrev' into next * ew/rev-abbrev: rev-list --abbrev-commit
Junio C Hamano
Merge branch 'jc/blame' into next * jc/blame: blame -S <ancestry-file> Match ofs/cnt types in diff interface.
Junio C Hamano
Merge branch 'kh/svn' into next * kh/svn: git-svnimport: Don't assume that copied files haven't changed Add Documentation/technical/pack-format.txt Added Packing Heursitics IRC writeup. Add documentation for git-imap-send.
Karl Hasselström
git-svnimport: Don't assume that copied files haven't changed Don't assume that a file that SVN claims was copied from somewhere else is bit-for-bit identical with its parent, since SVN allows changes to copied files before they are committed. Without this fix, such copy-modify-commit operations causes the imported file to lack the "modify" part -- that is, we get subtle data corruption. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Juni…
Junio C Hamano
rev-list --abbrev-commit This should make --pretty=oneline a whole lot more readable for people using 80-column terminals. Originally from Eric Wong. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Thin pack generation: optimization. Jens Axboe noticed that recent "git push" has become very slow since we made --thin transfer the default. Thin pack generation to push a handful revisions that touch relatively small number of paths out of huge tree was stupid; it registered _everything_ from the excluded revisions. As a result, "Counting objects" phase was unnecessarily expensive. This changes the logic to register the blobs a…
Junio C Hamano
Add Documentation/technical/pack-format.txt ... along with the previous one, pack-heuristics, by popular demand. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next