summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-05-04Merge branch 'js/fetchconfig' into nextLibravatar Junio C Hamano11-189/+315
* js/fetchconfig: Add a conversion tool to migrate remote information into the config fetch, pull: ask config for remote information Add a few more words to the glossary. Added definitions for a few words: Alphabetize the glossary. sha1_to_hex() usage cleanup
2006-05-04Add a conversion tool to migrate remote information into the configLibravatar Johannes Schindelin1-0/+35
Use this tool to rewrite the .git/remotes/* files into the config. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-04fetch, pull: ask config for remote informationLibravatar Johannes Schindelin1-4/+24
Now you can say [remote.junio] url = git://git.kernel.org/pub/scm/git/git.git fetch = next:next in your .git/config. [jc: fixed up the log message that still said "pull" ] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-04Merge branch 'jc/logs'Libravatar Junio C Hamano2-34/+3
* jc/logs: builtin-log/whatchanged/show: make them official.
2006-05-03Merge branch 'jc/show-branch-dense'Libravatar Junio C Hamano1-3/+30
* jc/show-branch-dense: show-branch: omit uninteresting merges.
2006-05-03Merge branch 'jc/symref'Libravatar Junio C Hamano6-11/+17
* jc/symref: core.prefersymlinkrefs: use symlinks for .git/HEAD
2006-05-03Merge branch 'jc/diff'Libravatar Junio C Hamano8-94/+407
* jc/diff: builtin-diff: call it "git-diff", really. builtin-diff.c: die() formatting type fix. built-in diff: assorted updates. built-in diff.
2006-05-03Merge branch 'js/repoconfig'Libravatar Junio C Hamano3-31/+79
* js/repoconfig: repo-config: deconvolute logics repo-config: readability fixups. repo-config: support --get-regexp
2006-05-03Merge branch 'jc/count'Libravatar Junio C Hamano6-35/+141
* jc/count: builtin-count-objects: open packs when running -v builtin-count-objects: make it official. built-in count-objects.
2006-05-03Merge branch 'js/remoteconfig'Libravatar Junio C Hamano4-3/+319
* js/remoteconfig: Revert "fetch, pull: ask config for remote information" fetch, pull: ask config for remote information builtin-push: also ask config for remote information builtin-push: make it official. Fix builtin-push to honor Push: lines in remotes file. builtin-push: resurrect parsing of Push: lines git builtin "push"
2006-05-03Merge branch 'maint'Libravatar Junio C Hamano2-169/+242
* maint: Add a few more words to the glossary. Added definitions for a few words: Alphabetize the glossary.
2006-05-03Add a few more words to the glossary.Libravatar Jon Loeliger1-12/+51
Clean up a few entries and fix typos. bare repository cherry-picking hook topic branch [jc: removing questionable "symbolic ref -- see 'ref'" for now.] Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Added definitions for a few words:Libravatar Jon Loeliger2-1/+34
fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Alphabetize the glossary.Libravatar Jon Loeliger1-169/+170
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03sha1_to_hex() usage cleanupLibravatar Linus Torvalds3-10/+7
Somebody on the #git channel complained that the sha1_to_hex() thing uses a static buffer which caused an error message to show the same hex output twice instead of showing two different ones. That's pretty easily rectified by making it uses a simple LRU of a few buffers, which also allows some other users (that were aware of the buffer re-use) to be written in a more straightforward manner. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Merge branch 'master' into nextLibravatar Junio C Hamano7-14/+33
* master: fix various typos in documentation blame: Fix path pruning cvsserver: use git-rev-list instead of git-log Fix "git-log --parents" breakage post v1.3.0 add documentation for update-index --unresolve
2006-05-03Merge branch 'js/repoconfig' into nextLibravatar Junio C Hamano1-24/+26
* js/repoconfig: repo-config: deconvolute logics
2006-05-03Merge branch 'fix'Libravatar Junio C Hamano3-4/+4
* fix: fix various typos in documentation
2006-05-03blame: Fix path pruningLibravatar Fredrik Kuivinen1-5/+5
This makes git-blame useable again, it has been totally broken for some time on larger repositories. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03cvsserver: use git-rev-list instead of git-logLibravatar Martin Langhoff1-2/+3
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03repo-config: deconvolute logicsLibravatar Johannes Schindelin1-24/+26
It was rightly noticed that the logic is quite convoluted. Fix that. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano3-6/+11
* jc/cache-tree: cache-tree: a bit more debugging support. read-tree: invalidate cache-tree entry when a new index entry is added. Fix test-dump-cache-tree in one-tree disappeared case.
2006-05-03cache-tree: a bit more debugging support.Libravatar Junio C Hamano1-2/+6
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03read-tree: invalidate cache-tree entry when a new index entry is added.Libravatar Junio C Hamano1-0/+2
When doing two-way merge, we failed to invalidate the directory that a new entry is added (we correctly did so for modified and deleted entries). Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Fix test-dump-cache-tree in one-tree disappeared case.Libravatar Junio C Hamano1-4/+3
When reconstructing an invalidated subtree for reference purposes by test-dump-cache-tree, we did not handle the case where we shouldn't have a cached and invalidated subtree in the result, leading to an unneeded die(). Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03Fix "git-log --parents" breakage post v1.3.0Libravatar Linus Torvalds1-2/+16
Post 1.3.0 "git log" forgets to list parent commits on the first line when --parents is given. git-cvsserver relied on it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03add documentation for update-index --unresolveLibravatar Matthias Kestenholz2-2/+6
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03fix various typos in documentationLibravatar Matthias Kestenholz3-4/+4
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Merge branch 'jc/count' into nextLibravatar Junio C Hamano1-0/+2
* jc/count: builtin-count-objects: open packs when running -v
2006-05-02builtin-count-objects: open packs when running -vLibravatar Junio C Hamano1-0/+2
Otherwise we would report absolutely no objects in a fully packed repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Merge branch 'jc/symref' into nextLibravatar Junio C Hamano6-11/+17
* jc/symref: core.prefersymlinkrefs: use symlinks for .git/HEAD
2006-05-02Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-15/+20
* jc/grep: builtin-grep: tighten path wildcard vs tree traversal.
2006-05-02Merge branch 'np/delta' into nextLibravatar Junio C Hamano1-16/+29
* np/delta: improve diff-delta with sparse and/or repetitive data tiny optimization to diff-delta
2006-05-02Merge branch 'js/repoconfig' into nextLibravatar Junio C Hamano4-383/+1486
* js/repoconfig: repo-config: readability fixups. repo-config: support --get-regexp gitk: Allow view to specify arbitrary arguments to git-rev-list gitk: Fix file list display when files are renamed gitk: Basic support for highlighting one view within another gitk: Add a tree-browsing mode gitk: Use a text widget for the file list gitk: add menu item for editing the current view gitk: Implement "permanent" views (stored in ~/.gitk) gitk: Use git-rev-parse only to identify file/dir names on cmd line gitk: Remember the view in the history list gitk: Don't reread git-rev-list output from scratch on view switch gitk: Fix various bugs in the view support gitk: Make File->Update work properly again gitk: Implement multiple views [PATCH] gitk: Add a visual tag for remote refs
2006-05-02improve diff-delta with sparse and/or repetitive dataLibravatar Nicolas Pitre1-13/+27
It is useless to preserve multiple hash entries for consecutive blocks with the same hash. Keeping only the first one will allow for matching the longest string of identical bytes while subsequent blocks will only allow for shorter matches. The backward matching code will match the end of it as necessary. This improves both performances (no repeated string compare with long successions of identical bytes, or even small group of bytes), as well as compression (less likely to need random hash bucket entry culling), especially with sparse files. With well behaved data sets this patch doesn't change much. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02tiny optimization to diff-deltaLibravatar Nicolas Pitre1-3/+2
This is my assembly freak side looking at generated code again. And since create_delta() is certainly pretty high on the radar every bits count. In this case shorter code is generated if hash_mask is not copied to a local variable. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02repo-config: readability fixups.Libravatar Junio C Hamano1-26/+20
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02core.prefersymlinkrefs: use symlinks for .git/HEADLibravatar Junio C Hamano6-11/+17
When inspecting a project whose build infrastructure used to assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs in the config file of such a project would help to bisect its history. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02repo-config: support --get-regexpLibravatar Johannes Schindelin3-8/+60
With --get-regexp, output all key/value pairs where the key matches a regexp. Example: git-repo-config --get-regexp remote.*.url will output something like remote.junio.url git://git.kernel.org/pub/scm/git/git.git remote.gitk.url git://git.kernel.org/pub/scm/gitk/gitk.git Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-357/+1414
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Allow view to specify arbitrary arguments to git-rev-list gitk: Fix file list display when files are renamed gitk: Basic support for highlighting one view within another gitk: Add a tree-browsing mode gitk: Use a text widget for the file list gitk: add menu item for editing the current view gitk: Implement "permanent" views (stored in ~/.gitk) gitk: Use git-rev-parse only to identify file/dir names on cmd line gitk: Remember the view in the history list gitk: Don't reread git-rev-list output from scratch on view switch gitk: Fix various bugs in the view support gitk: Make File->Update work properly again gitk: Implement multiple views [PATCH] gitk: Add a visual tag for remote refs
2006-05-02builtin-grep: tighten path wildcard vs tree traversal.Libravatar Junio C Hamano1-15/+20
The earlier code descended into Documentation/technical when given "Documentation/how*" as the pattern, which was too loose. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03gitk: Allow view to specify arbitrary arguments to git-rev-listLibravatar Paul Mackerras1-51/+196
The list of arguments to git-rev-list, including arguments that select the range of commits, is now a part of the view specification. If any arguments are given to gitk, they become part of the "Command line" view, and the non-file arguments become the default for any new views created. Getting an error from git-rev-list is no longer fatal; instead the error window pops up, and when you press OK, the main window just shows "No commits selected". The git-rev-list arguments are entered in an entry widget in the view editor window using shell quoting conventions, not Tcl quoting conventions. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-02Merge branch 'master' into nextLibravatar Junio C Hamano4-13/+39
* master: git-send-email: fix version string to be valid perl Give the user a hint for how to continue in the case that git-am fails because it requires user intervention repo-config: trim white-space before comment repo-config: fix segfault with no argument.
2006-05-02Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-28/+123
* jc/grep: builtin-grep: support -w (--word-regexp). builtin-grep: support -c (--count). builtin-grep: allow more than one patterns. builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
2006-05-02builtin-grep: support -w (--word-regexp).Libravatar Junio C Hamano1-0/+30
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-grep: support -c (--count).Libravatar Junio C Hamano1-1/+20
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-grep: allow more than one patterns.Libravatar Junio C Hamano1-21/+51
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.Libravatar Junio C Hamano1-6/+22
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Merge branch 'fix'Libravatar Junio C Hamano2-4/+31
* fix: git-send-email: fix version string to be valid perl Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
2006-05-02git-send-email: fix version string to be valid perlLibravatar Martin Langhoff1-1/+8
This makes git-send-email easier to develop and debug, skipping the need to `make git-send-email` every time. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 13:55:14 +0000