- 04 5月, 2006 15 次提交
-
-
由 Junio C Hamano 提交于
* js/repoconfig: repo-config: deconvolute logics repo-config: readability fixups. repo-config: support --get-regexp
-
由 Junio C Hamano 提交于
* jc/count: builtin-count-objects: open packs when running -v builtin-count-objects: make it official. built-in count-objects.
-
由 Junio C Hamano 提交于
* 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"
-
由 Junio C Hamano 提交于
* maint: Add a few more words to the glossary. Added definitions for a few words: Alphabetize the glossary.
-
由 Jon Loeliger 提交于
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: NJon Loeliger <jdl@jdl.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Jon Loeliger 提交于
fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: NJon Loeliger <jdl@jdl.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Jon Loeliger 提交于
Signed-off-by: NJon Loeliger <jdl@jdl.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Linus Torvalds 提交于
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: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: fix various typos in documentation
-
由 Fredrik Kuivinen 提交于
This makes git-blame useable again, it has been totally broken for some time on larger repositories. Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Martin Langhoff 提交于
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Johannes Schindelin 提交于
It was rightly noticed that the logic is quite convoluted. Fix that. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Linus Torvalds 提交于
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: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Matthias Kestenholz 提交于
Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Matthias Kestenholz 提交于
Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 03 5月, 2006 11 次提交
-
-
由 Junio C Hamano 提交于
Otherwise we would report absolutely no objects in a fully packed repository. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Johannes Schindelin 提交于
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.gitSigned-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
git://git.kernel.org/pub/scm/gitk/gitk由 Junio C Hamano 提交于
* 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
-
由 Paul Mackerras 提交于
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: NPaul Mackerras <paulus@samba.org>
-
由 Junio C Hamano 提交于
* 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
-
由 Martin Langhoff 提交于
This makes git-send-email easier to develop and debug, skipping the need to `make git-send-email` every time. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
This reverts 5a223a0d commit. I asked Johannes to roll an updated version, so let's wait for it.
-
由 Johannes Schindelin 提交于
Earlier, calling git-repo-config core.hello on a .git/config like this: [core] hello = world ; a comment would yield "world " (i.e. with a trailing space). Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Johannes Schindelin 提交于
An earlier addition of --list feature was carelessly done and caused an invalid access to argv[1] when it was not given. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Robert Shearman 提交于
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention Give the user a hint for how to continue in the case that git-am fails because it requires user intervention. Signed-off-by: NRobert Shearman <rob@codeweaves.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 02 5月, 2006 11 次提交
-
-
由 Paul Mackerras 提交于
The conversion of the file list to use a text widget assumed incorrectly that the list of files from git-diff-tree -r would correspond 1-1 with the diff sections in the output of git-diff-tree -r -p -C, which is not true when renames are detected. This fixes it by keeping the elements in the difffilestart list in the order they appear in the file list window. Since this means that the elements of difffilestart are no longer necessarily in ascending order, it's somewhat hard to do the dynamic highlighting in the file list as the diff window is scrolled, so I have taken that out for now. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Johannes Schindelin 提交于
Now you can say [remote.junio] url = git://git.kernel.org/pub/scm/git/git.git pull = next:next in your .git/config. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Johannes Schindelin 提交于
Now you can store your remote information in the config file like this: [remote.upstream] url = me@company.com:the-project push = master:iceballs [jc: fixed up to adjust a different fix for Push: lines earlier.] Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Remove the shell script version, and hardlink the git binary to it. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Remove the shell-script version, make the hardlink from the git binary, and update the documentation to describe a new option. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* jc/xsha1-2: Extended SHA1 -- "rev^@" syntax to mean "all parents"
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
* jc/pathcheck: revision parsing: make "rev -- paths" checks stronger.
-
由 Junio C Hamano 提交于
* nh/fetch-http: git-fetch: resolve remote symrefs for HTTP transport
-
由 Junio C Hamano 提交于
* se/rebase: Add --continue and --abort options to git-rebase.
-
由 Paul Mackerras 提交于
With this, one view can be used as a highlight for another, so that the commits that are in the highlight view are displayed in bold. This required some fairly major changes to how the list of ids, parents, children, and id to row mapping were stored for each view. We can now be reading in several views at once; for all except the current view, we just update the displayorder and the lists of parents and children for the view. This also creates a little bit of infrastructure for handling the watch cursor. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 01 5月, 2006 3 次提交
-
-
由 Junio C Hamano 提交于
A short-hand "rev^@" is understood to be "all parents of the named commit" with this patch. So you can do git show v1.0.0^@ to view the parents of a merge commit, gitk ^v1.0.0^@ v1.0.4 to view the log between two revs (including the bottom one), and git diff --cc v1.1.0 v1.0.0^@ to inspect what got changed from the merge parents of v1.0.0 to v1.1.0. This might be just my shiny new toy that is not very useful in practice. I needed it to do the multi-tree diff on Len's infamous 12-way Octopus; typing "diff --cc funmerge funmerge^1 funmerge^2 funmerge^3 ..." was too painful. [jc: taking suggestions from Linus and Johannes to match expectations from shell users who are used to see $@ or $* either of which makes sense. I tend to write "$@" more often so...] Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Paul Mackerras 提交于
You can now select whether you want to see the patch for a commit or the whole tree. If you select the tree, gitk will now display the commit message plus the contents of one file in the bottom-left pane, when you click on the name of the file in the bottom-right pane. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Junio C Hamano 提交于
[jc: originally from Johannes Schindelin, but reworked to lift a hard limit of Push: lines] Signed-off-by: NJunio C Hamano <junkio@cox.net>
-