summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-04-08diffcore-rename: fix merging back a broken pair.Libravatar Junio C Hamano1-4/+10
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>
2006-04-08diff: fix output of total-rewrite diff.Libravatar Junio C Hamano1-2/+3
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>
2006-04-08git-log: match rev-list --abbrev and --abbrev-commitLibravatar Junio C Hamano1-2/+13
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07Merge branch 'master' into nextLibravatar Junio C Hamano1-1/+1
* master: GIT 1.3.0-rc3
2006-04-07GIT 1.3.0-rc3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07Merge branch 'kh/svn'Libravatar Junio C Hamano1-5/+10
* kh/svn: git-svnimport: Don't assume that copied files haven't changed
2006-04-07Merge branch 'jc/thinpack'Libravatar Junio C Hamano1-48/+236
* jc/thinpack: Thin pack generation: optimization.
2006-04-07Merge branch 'jc/date'Libravatar Junio C Hamano1-21/+56
* jc/date: date parsing: be friendlier to our European friends.
2006-04-07Merge branch 'nh/http'Libravatar Junio C Hamano2-2/+287
* nh/http: Fix compile with expat, but an old curl version http-fetch: add optional DAV-based pack list
2006-04-07Merge branch 'ew/rev-abbrev'Libravatar Junio C Hamano1-1/+14
* ew/rev-abbrev: rev-list --abbrev-commit
2006-04-07Merge branch 'jc/blame'Libravatar Junio C Hamano7-302/+419
* 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.
2006-04-07Merge branch 'master' into nextLibravatar Junio C Hamano4-11/+30
* 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
2006-04-07Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-2/+2
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk
2006-04-07Merge branch 'maint'Libravatar Junio C Hamano3-9/+28
* maint: count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully
2006-04-07count-delta: match get_delta_hdr_size() changes.Libravatar Junio C Hamano1-2/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07check patch_delta bounds more carefullyLibravatar Nicolas Pitre3-9/+28
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>
2006-04-07Merge branch 'jc/thinpack' into nextLibravatar Junio C Hamano1-48/+236
* jc/thinpack: Thin pack generation: optimization.
2006-04-07Merge branch 'ew/rev-abbrev' into nextLibravatar Junio C Hamano1-1/+14
* ew/rev-abbrev: rev-list --abbrev-commit
2006-04-07Merge branch 'jc/blame' into nextLibravatar Junio C Hamano6-67/+135
* jc/blame: blame -S <ancestry-file> Match ofs/cnt types in diff interface.
2006-04-07Merge branch 'kh/svn' into nextLibravatar Junio C Hamano4-5/+647
* 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.
2006-04-07git-svnimport: Don't assume that copied files haven't changedLibravatar Karl Hasselström1-5/+10
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: Junio C Hamano <junkio@cox.net>
2006-04-07rev-list --abbrev-commitLibravatar Junio C Hamano1-1/+14
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>
2006-04-07Thin pack generation: optimization.Libravatar Junio C Hamano1-48/+236
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 and trees from excluded revisions only for paths we are actually going to send to the other end. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07Add Documentation/technical/pack-format.txtLibravatar Junio C Hamano1-0/+111
... along with the previous one, pack-heuristics, by popular demand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07Added Packing Heursitics IRC writeup.Libravatar Jon Loeliger1-0/+466
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07blame -S <ancestry-file>Libravatar Junio C Hamano3-60/+127
This adds the -S <ancestry-file> option to blame, which is needed by the CVS server emulation. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-06Match ofs/cnt types in diff interface.Libravatar Junio C Hamano3-7/+8
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Add documentation for git-imap-send.Libravatar Mike McCormack1-0/+60
Signed-off-by: Mike McCormack <mike@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Merge branch 'master' into nextLibravatar Junio C Hamano1-0/+1
* master: blame.c: fix completely broken ancestry traversal.
2006-04-05blame.c: fix completely broken ancestry traversal.Libravatar Junio C Hamano1-0/+1
Recent revision.c updates completely broken the assignment of blames by not rewriting commit->parents field unless explicitly asked to by the caller. The caller needs to set revs.parents. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-06gitk: Fix incorrect invocation of getmergedifflineLibravatar Paul Mackerras1-1/+1
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06[PATCH] gitk: Fix searching for filenames in gitkLibravatar Pavel Roskin1-1/+1
findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-05Merge branch 'jc/date' into nextLibravatar Junio C Hamano4-129/+312
* jc/date: date parsing: be friendlier to our European friends. Tweaks to make asciidoc play nice. git-commit: document --amend Avoid a crash if realloc returns a different pointer. Avoid a divide by zero if there's no messages to send. [PATCH] Provide configurable UI font for gitk [PATCH] gitk: Use git wrapper to run git-ls-remote. [PATCH] gitk: add key bindings for selecting first and last commit gitk: Add a help menu item to display key bindings [PATCH] gitk: allow goto heads gitk: replace parent and children arrays with lists
2006-04-05date parsing: be friendlier to our European friends.Libravatar Junio C Hamano1-21/+56
This does three things, only applies to cases where the user manually tries to override the author/commit time by environment variables, with non-ISO, non-2822 format date-string: - Refuses to use the interpretation to put the date in the future; recent kernel history has a commit made with 10/03/2006 which is recorded as October 3rd. - Adds '.' as the possible year-month-date separator. We learned from our European friends on the #git channel that dd.mm.yyyy is the norm there. - When the separator is '.', we prefer dd.mm.yyyy over mm.dd.yyyy; otherwise mm/dd/yy[yy] takes precedence over dd/mm/yy[yy]. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Tweaks to make asciidoc play nice.Libravatar Francis Daly1-4/+5
Once the content has been generated, the formatting elves can reorder it to be pretty... Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Merge branch 'jc/blame' into nextLibravatar Junio C Hamano1-93/+67
* jc/blame: blame: use built-in xdiff
2006-04-05Merge branch 'nh/http' into nextLibravatar Junio C Hamano1-1/+3
* nh/http: Fix compile with expat, but an old curl version
2006-04-05blame: use built-in xdiffLibravatar Junio C Hamano1-93/+67
This removes the last use of external diff from core git suite. Also addresses the use of index() -- elsewhere we tend to use strchr(). Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05git-commit: document --amendLibravatar Marco Roeland1-1/+23
The "--amend" option is used to amend the tip of the current branch. This documentation text was copied straight from the commit that implemented it. Some minor format tweaks for asciidoc were taken from work by Francis Daly in commit b0d08a5.. It looks good now also in the html page. [jc: amended further to follow the recommendation by Francis in commit 3070b60]. Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Merge branch 'jc/clone'Libravatar Junio C Hamano1-19/+28
* jc/clone: git-clone: fix handling of upsteram whose HEAD does not point at master.
2006-04-05Merge branch 'pb/regex'Libravatar Junio C Hamano4-16/+57
* pb/regex: On some platforms, certain headers need to be included before regex.h Support for pickaxe matching regular expressions
2006-04-05Avoid a crash if realloc returns a different pointer.Libravatar Mike McCormack1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Avoid a divide by zero if there's no messages to send.Libravatar Mike McCormack1-1/+6
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Fix compile with expat, but an old curl versionLibravatar Johannes Schindelin1-1/+3
With an old curl version, git-http-push is not compiled. But git-http-fetch still needs to be linked with expat if NO_EXPAT is not defined. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-106/+225
* git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] Provide configurable UI font for gitk [PATCH] gitk: Use git wrapper to run git-ls-remote. [PATCH] gitk: add key bindings for selecting first and last commit gitk: Add a help menu item to display key bindings [PATCH] gitk: allow goto heads gitk: replace parent and children arrays with lists
2006-04-05Merge branch 'jc/combine' into nextLibravatar Junio C Hamano3-46/+49
* jc/combine: combine-diff: move the code to parse hunk-header into common library.
2006-04-05combine-diff: move the code to parse hunk-header into common library.Libravatar Junio C Hamano3-46/+49
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Merge branches 'master' and 'jc/combine' into nextLibravatar Junio C Hamano9-68/+243
* master: Add git-clean command diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006 * jc/combine: combine-diff: refactor built-in xdiff interface.
2006-04-05Add git-clean commandLibravatar Pavel Roskin4-1/+132
This command removes untracked files from the working tree. This implementation is based on cg-clean with some simplifications. The documentation is included. [jc: with trivial documentation fix, noticed by Jakub Narebski] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Merge branch 'fix'Libravatar Junio C Hamano2-21/+27
* fix: diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 16:07:07 +0000