- 04 5月, 2006 1 次提交
-
-
由 Matthias Kestenholz 提交于
Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 03 5月, 2006 7 次提交
-
-
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>
-
由 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 7 次提交
-
-
由 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>
-
由 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 2 次提交
-
-
由 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>
-
- 30 4月, 2006 2 次提交
-
-
由 Junio C Hamano 提交于
* fix: git-format-patch: Use rfc2822 compliant date.
-
由 Huw Davies 提交于
Signed-off-by: NHuw Davies <huw@codeweavers.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 29 4月, 2006 7 次提交
-
-
由 Junio C Hamano 提交于
* fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
-
由 Sean Estabrooks 提交于
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Sean Estabrooks 提交于
Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Sean Estabrooks 提交于
Unfortunately docbook does not allow a callout to be referenced from inside a callout list description. Rewrite one paragraph in git-reset man page to work around this limitation. Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Sean Estabrooks 提交于
and fix up asciidoc "callouts" Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Matthias Kestenholz 提交于
Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
-
由 Matthias Kestenholz 提交于
Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
-
- 28 4月, 2006 7 次提交
-
-
由 Junio C Hamano 提交于
After doing the hard work of hand resolving the conflicts in the working tree, if the user forgets to run update-index to mark the paths that have been resolved, the command gave an unfriendly "fatal: git-write-tree: not able to write tree" error message. Catch the situation early and give more meaningful message and suggestion. Noticed and suggested by Len Brown. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
We used to omit delta base candidates that is much bigger than the target, but delta size does not grow when we delete more, so that was not a very good heuristics. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: verify-pack: check integrity in a saner order.
-
由 Junio C Hamano 提交于
Check internal integrity to report corrupt pack or idx, and then check cross-integrity between idx and pack. Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* pb/config: git-cvsserver: typofixes Deprecate usage of git-var -l for getting config vars list git-repo-config --list support
-
由 Junio C Hamano 提交于
* jc/diffstat: diff --stat: show complete rewrites consistently.
-
由 Linus Torvalds 提交于
When I split out the builtin commands into their own files, I left the include of <sys/ioctl.h> in git.c rather than moving it to the file that needed it (builtin-help.c). Nobody seems to have noticed, because everything still worked, but because the TIOCGWINSZ macro was now no longer defined when compiling the "term_columns()" function, it would no longer automatically notice the terminal size unless your system used the ancient "COLUMNS" environment variable approach. Trivially fixed by just moving the header include to the file that actually needs it. Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 27 4月, 2006 7 次提交
-
-
由 Paul Mackerras 提交于
This lets us do things like highlighting all the entries for which the corresponding part of the diff is at least partly visible in the commit/patch display window, and in future it will let us display the file list in a hierarchical form rather than as a flat file list. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Nick Hengeveld 提交于
git-fetch validates that a remote ref resolves to a SHA1 prior to calling git-http-fetch. This adds support for resolving a few levels of symrefs to get to the SHA1. Signed-off-by: NNick Hengeveld <nickh@reactrix.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 sean 提交于
git rebase [--onto <newbase>] <upstream> [<branch>] git rebase --continue git rebase --abort Add "--continue" to restart the rebase process after manually resolving conflicts. The user is warned if there are still differences between the index and the working files. Add "--abort" to restore the original branch, and remove the .dotest working files. Some minor additions to the git-rebase documentation. [jc: fix that applies to the maintenance track has been dealt with separately.] Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
If you don't have a "--" marker, then: - all of the arguments we are going to assume are pathspecs must exist in the working tree. - none of the arguments we parsed as revisions could be interpreted as a filename. so that there really isn't any possibility of confusion in case somebody does have a revision that looks like a pathname too. The former rule has been in effect; this implements the latter. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
-