summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* wt_status_prepare(): clean up structure initialization.Junio C Hamano2007-02-091-8/+1
| | | | | | Otherwise it would be a pain to add members to it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch: document automatic tag following.Junio C Hamano2007-02-091-0/+8
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* remove mailmap.linuxNicolas Pitre2007-02-091-42/+0
| | | | | | | | | | | This file is incomplete, unmaintained, and it doesn't belong in the GIT package anyway. A more complete version is already included in the Linux -mm tree and is about to make its way into mainline RSN. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-blame.el: Autoupdate while editingDavid Kågedal2007-02-091-9/+86
| | | | | | | | | This adds the support for automatically updating the buffer while editing. A configuration variable git-blame-autoupdate controls whether this should be enabled or not. Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-blame.el: Doc fixes and cleanupDavid Kågedal2007-02-091-4/+10
| | | | | Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-blame.el: blame unsaved changesDavid Kågedal2007-02-091-21/+44
| | | | | | | | | | | Make git-blame use the current buffer contents for the blame, instead of the saved file. This makes the blame correct even if there are unsaved changes. Also added a git-reblame command. Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-blame.el: improve color handlingDavid Kågedal2007-02-091-14/+10
| | | | | Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Handle uncommitted changes and cache descriptionsDavid Kågedal2007-02-091-6/+20
| | | | | Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-blame: Change installation instructionsJakub Narebski2007-02-091-4/+19
| | | | | | | | | | | | | | | | Change installation instructions to using either "(require 'git-blame)" or appropriate autoload instruction in GNU Emacs init file, .emacs This required adding "(provide 'git-blame)" at the end of git-blame.el and adding [preliminary] docstring to `git-blame-mode' function for consistency (to mark function as interactive in `autoload' we have to provide docstring as DOCSTRING is third arg, and INTERACTIVE fourth, and both are optional). `git-blame-mode' is marked to autoload. While at it ensure that we add `git-blame-mode' to `minor-mode-alist' only once (in a way that does not depend on `cl' package). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-blame: Add Emacs Lisp file headers and GNU GPL boilerplateJakub Narebski2007-02-091-3/+72
| | | | | | | | | | | | | | | | | | | | | Add Emacs Lisp file headers, according to "Coding Conventions" chapter in Emacs Lisp Reference Manual and Elisp Area Convetions for EmacsWiki: http://www.emacswiki.org/cgi-bin/wiki/ElispAreaConventions Those include: copyright notice, GNU GPL boilerplate, description and instalation instructions as provided in email and in commit message introducing git-blame.el, compatibility notes from another email by David Kågedal about what to change to use it in GNU Emacs 20, and "git-blame ends here" to detect if file was truncated. First line includes setting file encoding via first line local variable values (file variables). Added comment to "(require 'cl)" to note why it is needed; "Coding Conventions" advises to avoid require the `cl' package of Common Lisp extensions at run time. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-pull: describe default behaviour and config interactionsJunio C Hamano2007-02-081-0/+54
| | | | | | | The way 'git pull' without explicit parameters work were not explained well in any existing documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* reflog: handle $name => remotes/%s/HEAD mapping consistently for logsJunio C Hamano2007-02-081-8/+21
| | | | | | | | | | When refs/remotes/gfi/master and refs/remotes/gfi/HEAD exist, and the latter is a symref that points at the former, dwim_ref() resolves string "gfi" to "refs/remotes/gfi/master" as expected, but dwim_log() does not understand "gfi@{1.day}" and needs to be told "gfi/master@{1.day}". This is confusing. Signed-off-by: Junio C Hamano <junkio@cox.net>
* log --reflog: use dwim_logJohannes Schindelin2007-02-083-1/+15
| | | | | | | | | Since "git log origin/master" uses dwim_log() to match "refs/remotes/origin/master", it makes sense to do that for "git log --reflog", too. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* format-patch -n: make sorting easier by padding numberJohannes Schindelin2007-02-081-1/+12
| | | | | | | | | | Now, when format-patch outputs more than 9 patches, the numbers are padded accordingly. Example: [PATCH 009/167] The 9th patch of a series of 167 Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* log --reflog: honour --relative-dateJohannes Schindelin2007-02-083-7/+10
| | | | | | | | If you say "git log -g --relative-date", it is very likely that you want to see the reflog names in terms of a relative date. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* for_each_reflog_ent: be forgiving about missing messageJohannes Schindelin2007-02-081-3/+5
| | | | | | | | Some reflogs are/were generated without a message; do not plainly ignore those entries. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-02-082-84/+190
|\ | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: tar archive frontend for fast-import. Correct spelling of fast-import in docs. Correct some language in fast-import documentation. Correct ^0 asciidoc syntax in fast-import docs.
| * tar archive frontend for fast-import.Shawn O. Pearce2007-02-081-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an example fast-import frontend, in less than 100 lines of Perl. It accepts one or more tar archives on the command line, passes them through gzcat/bzcat/zcat if necessary, parses out the individual file headers and feeds all contained data to fast-import. No temporary files are involved. Each tar is treated as one commit, with the commit timestamp coming from the oldest file modification date found within the tar. Each tar is also tagged with an annotated tag, using the basename of the tar file as the name of the tag. Currently symbolic links and hard links are not handled by the importer. The file checksums are also not verified. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Correct spelling of fast-import in docs.Shawn O. Pearce2007-02-081-78/+78
| | | | | | | | | | | | | | Its spelled 'fast-import', not 'gfi'. Linus and Dscho have both recently pointed this out to me on the mailing list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Correct some language in fast-import documentation.Shawn O. Pearce2007-02-081-5/+6
| | | | | | | | | | | | | | Minor documentation improvements, as suggested on the Git mailing list by Horst H. von Brand and Karl Hasselström. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Correct ^0 asciidoc syntax in fast-import docs.Shawn O. Pearce2007-02-081-2/+2
| | | | | | | | | | | | | | | | I wrote this documentation with asciidoc 7.1.2, but apparently asciidoc 8 assumes ^ means superscript. The solution was already documented in rev-parse's manpage and is to use {caret} instead. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | git reflog showLinus Torvalds2007-02-084-10/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes "git reflog [show]" act as git log -g --pretty=oneline --abbrev-cmit and is fairly straightforward. So you can just write git reflog or git reflog show and it will show you the reflog in a nice format. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | add -C[NUM] to git-amMichael S. Tsirkin2007-02-084-6/+25
| | | | | | | | | | | | | | | | Add -C[NUM] to git-am and git-rebase so that patches can be applied even if context has changed a bit. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update git-log and git-show documentationMichael S. Tsirkin2007-02-082-1/+4
| | | | | | | | | | | | Point at where the options not so frequently used are found. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Read cvsimport options from repo-configJames Bowes2007-02-071-1/+29
| | | | | | | | | | | | | | | | | | | | Default values for command line options can be saved in .git/config (or the global ~/.gitconfig). Config option names match the command line option names, so cvsimport.d corresponds to git-cvsimport -d. One may also set cvsimport.module to specify a default cvs module name. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | create_symref(): create leading directories as needed.Junio C Hamano2007-02-071-0/+3
| | | | | | | | | | | | | | Otherwise "git remote add -t master -m master" without the initial fetch would not work. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT v1.5.0-rc4v1.5.0-rc4Junio C Hamano2007-02-071-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: Add gfi to the main command list.Junio C Hamano2007-02-071-0/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix "git log -z" behaviourLinus Torvalds2007-02-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For commit messages, we should really put the "line_termination" when we output the character in between different commits, *not* between the commit and the diff. The diff goes hand-in-hand with the commit, it shouldn't be separated from it with the termination character. So this: - uses the termination character for true inter-commit spacing - uses a regular newline between the commit log and the diff We had it the other way around. For the normal case where the termination character is '\n', this obviously doesn't change anything at all, since we just switched two identical characters around. So it's very safe - it doesn't change any normal usage, but it definitely fixes "git log -z". By fixing "git log -z", you can now also do insane things like git log -p -z | grep -z "some patch expression" | tr '\0' '\n' | less -S and you will see only those commits that have the "some patch expression" in their commit message _or_ their patches. (This is slightly different from 'git log -S"some patch expression"', since the latter requires the expression to literally *change* in the patch, while the "git log -p -z | grep .." approach will see it if it's just an unchanged _part_ of the patch context) Of course, if you actually do something like the above, you're probably insane, but hey, it works! Try the above command line for a demonstration (of course, you need to change the "some patch expression" to be something relevant). The old behaviour of "git log -p -z" was useless (and got things completely wrong for log entries without patches). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-add -i: update removed path correctly.Junio C Hamano2007-02-071-2/+1
| | | | | | | | | | | | | | | | | | | | Earlier, when a path that was removed from the working tree was chosen for update subcommand, you got an error like this: error: git-resolve.sh: does not exist and --remove not passed fatal: Unable to process file git-resolve.sh Signed-off-by: Junio C Hamano <junkio@cox.net>
* | t4200: skip gc-rerere test on systems with non GNU date.Junio C Hamano2007-02-071-20/+17
| | | | | | | | | | | | | | | | | | | | Quite nonstandard "date -d @11111111 +%s" does not even fail on OpenBSD but gives the current date in "seconds since epoch" format, which is useless for the purpose of this test. We want to make sure that this returns exactly the same input before proceeding. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ml/gitk' (early part)Junio C Hamano2007-02-071-132/+156
|\ \ | | | | | | | | | | | | | | | | | | * 'ml/gitk' (early part): gitk: Use show-ref instead of ls-remote Make gitk work reasonably well on Cygwin. gitk - remove trailing whitespace from a few lines.
| * | gitk: Use show-ref instead of ls-remoteJunio C Hamano2007-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | It used to be ls-remote on self was the only easy way to grab the ref information. Now we have show-ref which does not involve fork and IPC, so use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Make gitk work reasonably well on Cygwin.Mark Levedahl2007-02-051-126/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gitk gui layout was completely broken on Cygwin. If gitk was started without previous geometry in ~/.gitk, the user could drag the window sashes to get a useable layout. However, if ~/.gitk existed, this was not possible at all. The fix was to rewrite makewindow, changing the toplevel containers and the particular geometry information saved between sessions. Numerous bugs in both the Cygwin and the Linux Tk versions make this a delicate balancing act: the version here works in both but many subtle variants are competely broken in one or the other environment. Three user visible changes result: 1 - The viewer is fully functional under Cygwin. 2 - The search bar moves from the bottom to the top of the lower left pane. This was necessary to get around a layout problem on Cygwin. 3 - The window size and position is saved and restored between sessions. Again, this is necessary to get around a layout problem on Cygwin. Signed-off-by: Mark Levedahl <mdl123@verizon.net>
| * | gitk - remove trailing whitespace from a few lines.Mark Levedahl2007-02-051-4/+4
| | | | | | | | | | | | Signed-off-by: Mark Levedahl <mdl123@verizon.net>
* | | fast-import: Fix compile warningsJohannes Schindelin2007-02-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Not on all platforms are size_t and unsigned long equivalent. Since I do not know how portable %z is, I play safe, and just cast the respective variables to unsigned long. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | for-each-reflog: fix case for empty log directoryJunio C Hamano2007-02-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we remove the last reflog in a directory, opendir() would succeed and we would iterate over its dirents, expecting retval to be initialized to zero and setting it to non-zero only upon seeing an error. If the directory is empty, oops!, we do not have anybody that touches retval. The problem is because we initialize retval to errno even on success from opendir(), which would leave the errno unmolested. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-02-073-57/+277
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: Add a Tips and Tricks section to fast-import's manual. Don't crash fast-import if the marks cannot be exported. Dump all refs and marks during a checkpoint in fast-import. Teach fast-import how to sit quietly in the corner. Teach fast-import how to clear the internal branch content. Minor timestamp related documentation corrections for fast-import.
| * | Add a Tips and Tricks section to fast-import's manual.Shawn O. Pearce2007-02-071-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | There has been some informative lessons learned in the gfi user community, and these really should be written down and documented for future generations of frontend developers. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Don't crash fast-import if the marks cannot be exported.Shawn O. Pearce2007-02-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently fast-import used to die a horrible death if we were unable to open the marks file for output. This is slightly less than ideal, especially now that we dump the marks as part of the `checkpoint` command. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Dump all refs and marks during a checkpoint in fast-import.Shawn O. Pearce2007-02-072-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the frontend asks us to checkpoint (via the explicit checkpoint command) its probably because they are afraid the current import will crash/fail/whatever and want to make sure they can pickup from the last checkpoint. To do that sort of recovery, we will need the current tip of every branch and tag available at the next startup. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Teach fast-import how to sit quietly in the corner.Shawn O. Pearce2007-02-072-33/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often users will be running fast-import from within a larger frontend process, and this may be a frequent periodic tool such as a future edition of `git-svn fetch`. We don't want to bombard users with our large stats output if they won't be interested in it, so `--quiet` is now an option to make gfi be more silent. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Teach fast-import how to clear the internal branch content.Shawn O. Pearce2007-02-073-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some frontends may not be able to (easily) keep track of which files are included in the branch, and which aren't. Performing this tracking can be tedious and error prone for the frontend to do, especially if its foreign data source cannot supply the changed path list on a per-commit basis. fast-import now allows a frontend to request that a branch's tree be wiped clean (reset to the empty tree) at the start of a commit, allowing the frontend to feed in all paths which belong on the branch. This is ideal for a tar-file importer frontend, for example, as the frontend just needs to reformat the tar data stream into a gfi data stream, which may be something a few Perl regexps can take care of. :) Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Minor timestamp related documentation corrections for fast-import.Shawn O. Pearce2007-02-071-7/+14
| | | | | | | | | | | | | | | | | | | | | As discussed on the mailing list, the documentation used here was not quite accurate. Improve upon it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | git-clone --reference: work well with pack-ref'ed reference repositoryJunio C Hamano2007-02-071-35/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier we only used loose refs to anchor already existing objects. When cloning from a repository that forked relatively long time ago from the reference repository, this made the want/have exchange by fetch-pack to do unnecessary work. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Avoid ActiveState Perl IO in t800[12]Alex Riesen2007-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use sed instead, it comes with cygwin and there is almost no chance of someone installing a sed with default CRLF lineendings by accident. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: add KMail in SubmittingPatchesMichael2007-02-071-1/+17
| | | | | | | | | | | | | | | Signed-off-by: Michael <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Remove git-merge-recurJunio C Hamano2007-02-062-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was useful when the current recursive was in development, and the original Python version was still called git-merge-recursive. Now the synonym has served us well, it is time to move on. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add deprecation notices.Junio C Hamano2007-02-062-1/+3
| | | | | | | | | | | | | | | | | | Schedule git-diff-stages and git-resolve to be removed by 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-02-065-0/+3139
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: (81 commits) S_IFLNK != 0140000 Don't do non-fastforward updates in fast-import. Support RFC 2822 date parsing in fast-import. Minor fast-import documentation corrections. Remove unnecessary null pointer checks in fast-import. Correct fast-import timezone documentation. Correct minor style issue in fast-import. Correct compiler warnings in fast-import. Remove --branch-log from fast-import. Initial draft of fast-import documentation. Don't support shell-quoted refnames in fast-import. Reduce memory usage of fast-import. Include checkpoint command in the BNF. Accept 'inline' file data in fast-import commit structure. Reduce value duplication in t9300-fast-import. Create test case for fast-import. Support delimited data regions in fast-import. Remove unnecessary options from fast-import. Use fixed-size integers when writing out the index in fast-import. Always use struct pack_header for pack header in fast-import. ...
View Lorry Controller Status