| 99977bd | Junio C Hamano | 07 September 2005, 22:59:24 UTC | GIT 0.99.6 | 07 September 2005, 22:59:24 UTC |
| 7eb93c8 | David_K\xe5gedal | 07 September 2005, 07:29:20 UTC | [PATCH] Simplify git script The code for listing the available subcommands was unnecessarily complex. Signed-off-by: David K\xe5gedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:29:50 UTC |
| 452ce29 | Junio C Hamano | 07 September 2005, 21:28:21 UTC | Documentation updates. More commands are documented now; thanks Raymond. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:28:21 UTC |
| fa6a142 | A Large Angry SCM | 07 September 2005, 21:20:41 UTC | [PATCH] Docs for git-build-rev-cache. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:24:41 UTC |
| 8bfcd30 | A Large Angry SCM | 07 September 2005, 21:19:48 UTC | [PATCH] Docs for git-show-rev-cache. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:24:41 UTC |
| f67545e | A Large Angry SCM | 07 September 2005, 21:18:51 UTC | [PATCH] Docs for git-reset-script. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:24:41 UTC |
| 0270f7c | A Large Angry SCM | 07 September 2005, 21:17:18 UTC | [PATCH] Docs for git-checkout-script. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:24:39 UTC |
| 5077fa9 | Junio C Hamano | 07 September 2005, 21:08:38 UTC | Documentation updates. parse-remote and rev-parse gets full documentation. Add skeleton for archimport. Link them from the main git(7) page. Also move git-daemon and git-request-pull out of 'undocumented' section. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 21:20:57 UTC |
| 597c9cc | Junio C Hamano | 07 September 2005, 19:22:56 UTC | Flatten tools/ directory to make build procedure simpler. Also make platform specific part more isolated. Currently we only have Darwin defined, but I've taken a look at SunOS specific patch (which I dropped on the floor for now) as well. Doing things this way would make adding it easier. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 September 2005, 19:22:56 UTC |
| b893f09 | Junio C Hamano | 06 September 2005, 23:46:34 UTC | mailinfo: barf and exist upon nested multipart. At least we can detect what we do not handle. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 September 2005, 23:46:34 UTC |
| 78938b0 | Junio C Hamano | 06 September 2005, 20:51:33 UTC | Merge branch 'master' of . | 06 September 2005, 20:51:33 UTC |
| 760b663 | Rene Scharfe | 06 September 2005, 19:21:16 UTC | [PATCH] Update documentation for git-get-tar-commit-id ... and add a copyright notice. [jc: also move its entry in git.txt from undocumented section.] Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 September 2005, 20:49:11 UTC |
| 0d821d4 | H. Peter Anvin | 06 September 2005, 17:36:01 UTC | [PATCH] git-cvsimport-script: handling of tags This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 September 2005, 18:57:37 UTC |
| 89580e3 | Junio C Hamano | 06 September 2005, 16:06:32 UTC | Format fix for asciidoc documentation titles. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 September 2005, 16:06:32 UTC |
| 712d865 | Junio C Hamano | 05 September 2005, 08:42:11 UTC | Merge branch 'master' of . | 05 September 2005, 08:42:11 UTC |
| 0516de3 | Junio C Hamano | 05 September 2005, 07:47:39 UTC | Retire git-clone-dumb-http. ... and fold it into git-clone-script. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 September 2005, 07:47:39 UTC |
| f9e320c | Ryan Anderson | 05 September 2005, 05:13:07 UTC | [PATCH] Update documentation of --compose to git-send-email-script.txt Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 September 2005, 06:33:19 UTC |
| 1f038a0 | Ryan Anderson | 05 September 2005, 05:13:07 UTC | [PATCH] Make git-send-email-script ignore some unnecessary options when operating in batch mode. Add a "--compose" option that uses $EDITOR to edit an "introductory" email to the patch series. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 September 2005, 06:33:17 UTC |
| 8de8a29 | Junio C Hamano | 05 September 2005, 06:30:08 UTC | Install archimport-script. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 September 2005, 06:32:56 UTC |
| f5f2c52 | Junio C Hamano | 04 September 2005, 22:47:28 UTC | Merge branch 'master' of . | 04 September 2005, 22:47:28 UTC |
| 52be5fc | Junio C Hamano | 04 September 2005, 22:40:18 UTC | Add copy/rename check for git-apply. The new test pattern is taken from HPA's klibc and klibc-kbuild trees, which has many interesting renames (the commits 001eef5a19219e5b0601068a3d13874b88c0653e and 0037d1bc0deaf7daec3778496656cb04b4e4b9d0). The test pattern exposes problems in the apply.c changes currently in the proposed updates branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 22:44:55 UTC |
| c743e6e | Junio C Hamano | 04 September 2005, 18:25:56 UTC | Add a link from update-server-info documentation to repository layout. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 18:25:56 UTC |
| 433ef8a | Fredrik Kuivinen | 04 September 2005, 17:29:02 UTC | [PATCH] Make git-apply understand incomplete lines in non-C locales The message "\ No newline at end of file" used by diff(1) to mark an incomplete line is locale dependent. We can't assume more than that it begins with "\ ". For example, given two files, "foo" and "bar", with appropriate contents, 'diff -u foo bar' will produce the following output on my system: --- foo 2005-09-04 18:59:38.000000000 +0200 +++ bar 2005-09-04 18:59:16.000000000 +0200 @@ -1 +1 @@ -foobar +foo \ Ingen nyrad vid filslut [jc: the check for the marker still uses the line length being no less than 12 bytes for a sanity check, but I think it is safe to assume that in other locales. I haven't checked the .po files from diff, tho'.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 18:00:28 UTC |
| 07a95d0 | Junio C Hamano | 04 September 2005, 17:37:07 UTC | git-applymbox: fix '-c'. Earlier round b50abe8843006e9856c633b5abeb4eab53b46629 broke it by carelessly rewriting the main loop. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 17:37:07 UTC |
| 52586ec | Martin Langhoff | 04 September 2005, 10:55:29 UTC | [PATCH] archimport: avoid committing on an Arch tag Arch tags are full commits (without any changed files) as well. Trust Arch to have put an unchanged tree in place (which seems to do reliably), and just add a tag & new branch. Speeds up Arch imports significantly, and leaves history in a much saner state. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 17:28:43 UTC |
| 3292ae4 | Martin Langhoff | 04 September 2005, 10:55:06 UTC | [PATCH] archimport autodetects import status, supports incremental imports If there is no GIT directory, archimport will assume it is an initial import. It now also supports incremental imports, skipping "seen" commits. You can now run it repeatedly to pull new commits from the Arch repository. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 17:28:43 UTC |
| ce726ec | Sergey Vlasov | 04 September 2005, 09:43:16 UTC | [PATCH] NUL terminate the object data in patch_delta() At least pretty_print_commit() expects to get NUL-terminated commit data to work properly. unpack_sha1_rest(), which reads objects from separate files, and unpack_non_delta_entry(), which reads non-delta-compressed objects from pack files, already add the NUL byte after the object data, but patch_delta() did not do it, which caused problems with, e.g., git-rev-list --pretty when there are delta-compressed commit objects. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 17:28:43 UTC |
| 2ab141a | Peter Hagervall | 02 September 2005, 12:17:10 UTC | [PATCH] Possible cleanups for local-pull.c Hi. This patch contains the following possible cleanups: * Make some needlessly global functions in local-pull.c static * Change 'char *' to 'const char *' where appropriate Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 17:28:38 UTC |
| baeda3a | Paolo 'Blaisorblade' Giarrusso | 02 September 2005, 09:56:52 UTC | [PATCH] Doc: replace read-cache with git-read-tree. Replace references to "read-cache" with references to git-read-tree in the documentation. I chose that because reference say "see read-cache about stages", and stages are explained in git-read-tree. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 September 2005, 17:18:45 UTC |
| 6d35cc7 | Junio C Hamano | 03 September 2005, 04:19:26 UTC | Document hooks. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 September 2005, 05:38:30 UTC |
| 8afaf4c | Junio C Hamano | 02 September 2005, 22:32:55 UTC | Merge branch 'master' of . | 02 September 2005, 22:32:55 UTC |
| 953e584 | Junio C Hamano | 02 September 2005, 18:46:43 UTC | Mention post-update when we first talk about publishing a repository. There is more detailed instruction for `project lead` later in the tutorial to talk about the same, but at this point in the flow of tutorial, the first time reader has no way of knowing it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 September 2005, 18:46:43 UTC |
| 86b13da | Junio C Hamano | 02 September 2005, 17:53:15 UTC | scripts: equality test '==' is not portable. On NetBSD 3 we trigger an error: [: ==: unexpected operator Double-equal is accepted by bash built-in '[' and bash(1) suggests using '=' for strict POSIX compliance (test(1) from coreutils does not mention '=='). Eradicate their uses everywhere. [jc: Somebody with a pseudonym kindly sent a message to let me know about the problem privately; I do not have access to a NetBSD box.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 September 2005, 17:53:15 UTC |
| 79882c2 | Junio C Hamano | 02 September 2005, 17:39:57 UTC | git-checkout-script: Remove unnecessary variable. There was unused variable $i that counted the number of arguments being processed. Remove it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 September 2005, 17:39:57 UTC |
| 06ec2b4 | Junio C Hamano | 02 September 2005, 09:34:13 UTC | Fix automerge message. The rewrite done while adding the shorthand support made the remote refname recorded in the commit message too long for human consumption, while losing information by using the shorthand not the real URL to name the remote repository there. They were both bad changes done without enough thinking. Pointed out by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 September 2005, 09:34:13 UTC |
| 89bc8c7 | Amos Waterland | 01 September 2005, 14:13:50 UTC | [PATCH] Explain what went wrong on update-cache of new file If somebody tries to run `git update-cache foo', where foo is a new file, git dies with a rather cryptic error message: fatal: Unable to add foo to database This trivial patch makes git explain what probably went wrong. It is not a perfect diagnosis of all error paths, but for 90% of the cases it should provide the user with the clue they need. [jc: I ended up wording slightly differently, and fixed another confusing error message I noticed while reviewing the code.] Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 September 2005, 04:45:00 UTC |
| a1d4aa7 | Junio C Hamano | 01 September 2005, 23:56:13 UTC | Add repository-layout document. ... and link to it from both the main index and the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 September 2005, 23:56:13 UTC |
| 80b52b0 | Junio C Hamano | 01 September 2005, 08:02:39 UTC | Merge refs/heads/master from . | 01 September 2005, 08:02:39 UTC |
| 2d56993 | Junio C Hamano | 01 September 2005, 00:15:25 UTC | Use 'git status' now it can handle initial commit. Update 'git commit' to use the updated `git status`. Also earlier the `-s` flag was ignored for the initial commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 September 2005, 00:15:25 UTC |
| 7e011c4 | Junio C Hamano | 01 September 2005, 00:13:48 UTC | Fix git-status when HEAD is invalid. It tried to do git-diff-cache against HEAD, of course. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 September 2005, 00:13:48 UTC |
| 6e7722e | Junio C Hamano | 01 September 2005, 00:11:39 UTC | Fix git-log-script when HEAD is invalid. It used 'die' without including git-sh-setup-script; since everything it uses are subdirectory-aware, instead of including the script to force it to be run from the top, use echo & exit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 September 2005, 00:11:39 UTC |
| 1eb446f | Junio C Hamano | 31 August 2005, 18:48:41 UTC | Add Pine 4.63 help from Daniel. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 August 2005, 18:48:41 UTC |
| 466fede | Junio C Hamano | 31 August 2005, 06:11:12 UTC | Merge refs/heads/master from . | 31 August 2005, 06:11:12 UTC |
| 914328a | Junio C Hamano | 31 August 2005, 06:08:06 UTC | Update tutorial. Finally I bit the bullet and did a full sweep of this document. The changes are mostly clarifications, adjusting old terminology to the glossary compatible one, and asciidoc formatting. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 August 2005, 06:08:06 UTC |
| 076b232 | Junio C Hamano | 30 August 2005, 23:59:37 UTC | show-branch: make it work in a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 August 2005, 02:19:02 UTC |
| d396836 | Martin Langhoff | 30 August 2005, 09:56:52 UTC | [PATCH] Initial import of git-archimport-script Imports a project history from one or more Arch repositories, following the branching and tagging across repositories. Note you should import separate projects to separate GIT repositories. Supported - Imports, tags and simple commits. - File renames - Arch tags - Binary files - Large trees - Multiple repositories - Branches TODO: - Allow re-running the import on an already-imported project - Follow merges using Arch data - Audit shell escaping of filenames - Better support for file metadata - Better/safer creation of temp directories Unsupported: - Arch 'configuration' [jc: my arch/tla is very rusty and after Tom announced he is stepping down as the maintainer I have very little motivation to relearn it, so I would appreciate if people discuss any bugs or enhancements directly with Martin. Of course I can help with the git end of the issues.] Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 22:30:30 UTC |
| fc1a420 | Junio C Hamano | 30 August 2005, 21:33:27 UTC | Merge refs/heads/master from . | 30 August 2005, 21:33:27 UTC |
| 5da22bc | Junio C Hamano | 30 August 2005, 16:07:50 UTC | cat-file: make it work in a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 73244994ee4abd6e436e8a1d597dd917271d77a9 commit) | 30 August 2005, 20:56:21 UTC |
| 8db9307 | Junio C Hamano | 30 August 2005, 20:51:01 UTC | Documentaion updates. Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit) | 30 August 2005, 20:55:34 UTC |
| cc9f24d | Junio C Hamano | 30 August 2005, 19:45:41 UTC | 'git bisect visualize' Linus says: I'm testing bisection to find a bug that causes my G5 to no longer boot, and during the process have found this command line very nice: gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) it basically shows the state of bisection with the known bad commit as the top, and cutting off all the good commits - so what you see are the potential buggy commits. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 19:45:41 UTC |
| 670f5fe | Linus Torvalds | 30 August 2005, 18:04:39 UTC | [PATCH] Fix bisection terminating condition When testing bisection and using gitk to visualize the result, it was obvious that the termination condition was broken. We know what the bad entry is only when the bisection ends up telling us to test the known-bad entry again. Also, add a safety net: if somebody marks as good something that includes the known-bad point, we now notice and complain, instead of writing an empty revision to the new bisection branch. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 18:57:28 UTC |
| b758087 | Junio C Hamano | 30 August 2005, 08:10:10 UTC | Merge refs/heads/master from . | 30 August 2005, 08:10:10 UTC |
| 61f01a5 | Junio C Hamano | 30 August 2005, 08:08:24 UTC | parse-remote: trivial fix to allow refs/{heads,tags}/ spelled easier. Earlier we always prefixed refs/heads to the token given to "git fetch" (and "git pull") as refspec. This was a mistake. Allow them to be spelled like "master:refs/tags/paulus" to mean "I want to fetch the master there and store it as my local "paulus" tag. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 08:08:24 UTC |
| 5101710 | Junio C Hamano | 30 August 2005, 07:44:44 UTC | Merge refs/heads/master from paulus | 30 August 2005, 07:44:44 UTC |
| 789d577 | Junio C Hamano | 30 August 2005, 06:09:22 UTC | Make sure howto/*.html is built as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 06:09:22 UTC |
| cdcb0ed | Linus Torvalds | 30 August 2005, 05:36:16 UTC | [PATCH] Make "git resolve" less scary When we resolve a merge between two branches, and it removes a file in the current branch, we notify the person doing the resolve with a big nice notice like Removing xyzzy which is all well and good. HOWEVER, we also do this when the file was actually removed in the current branch, and we're merging with another branch that didn't have it removed (or, indeed, if the other branch _did_ have it removed, but the common parent was far enough back that the file still existed in there). And that just doesn't make sense. In that case we're not removing anything: the file didn't exist in the branch we're merging into in the first place. So the message just makes people nervous, and makes no sense. This has been around forever, but I never bothered to do anything about it. Until now. The trivial fix is to only talk about removing files if the file existed in the branch we're merging into, but will not exist in the result. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 05:55:42 UTC |
| 1a965f3 | Junio C Hamano | 30 August 2005, 05:38:45 UTC | Merge refs/heads/master from . | 30 August 2005, 05:38:45 UTC |
| 8d0991d | Junio C Hamano | 30 August 2005, 05:38:12 UTC | Allow asciidoc formatted documentation in howto/ Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 05:38:12 UTC |
| 706df00 | Junio C Hamano | 30 August 2005, 04:51:26 UTC | Merge refs/heads/master from . | 30 August 2005, 04:51:26 UTC |
| 3459c2c | Junio C Hamano | 30 August 2005, 04:50:49 UTC | Add [HOWTO] revert/branch/rebase. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 04:50:49 UTC |
| bc4af68 | Junio C Hamano | 30 August 2005, 04:25:19 UTC | git commit: Allow editing on all occasions. Sometimes it may be handy to be able to edit messages that come from somewhere other than an existing commit. This makes 'git commit -F <file> -e' to start editor with the initial log message contents taken from <file>. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 04:25:19 UTC |
| 9fa4db5 | Junio C Hamano | 30 August 2005, 04:19:04 UTC | Do not verify reverted/cherry-picked/rebased patches. The original committer may have used validation criteria that is less stricter than yours. You do not want to lose the changes even if they are done in substandard way from your 'commit -v' verifier's point of view. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 04:19:04 UTC |
| 5de36bf | Junio C Hamano | 30 August 2005, 04:17:21 UTC | Fix compilation warnings. ... found by compiling them with gcc 2.95. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 04:17:21 UTC |
| cf6de18 | A Large Angry SCM | 30 August 2005, 02:34:07 UTC | [PATCH] Update Thunderbird specific hints. Setting the wraplength to zero keeps the bird from trimming WS. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 1d535d525d6a0ddddc3755065d721278bc5f0aff commit) | 30 August 2005, 04:10:10 UTC |
| b5dca4b | A Large Angry SCM | 30 August 2005, 02:33:14 UTC | [PATCH] Documentation for git-request-pull-script. Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 10dce95490cb02f66b3a08984ccdee0a92b48236 commit) | 30 August 2005, 04:10:09 UTC |
| 1efdd27 | A Large Angry SCM | 30 August 2005, 02:32:04 UTC | [PATCH] Documentation for git-clone-dumb-http. Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from f79528e5d05a64d68b8e09a18521950775e99ec1 commit) | 30 August 2005, 04:10:09 UTC |
| 62cd033 | A Large Angry SCM | 30 August 2005, 02:31:22 UTC | [PATCH] Documentation for git-daemon. Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 5d0a4efeff62cfa363437f91308453b5b9fd8cf5 commit) | 30 August 2005, 04:10:08 UTC |
| 7a03433 | Junio C Hamano | 30 August 2005, 02:09:48 UTC | Merge refs/heads/master from . | 30 August 2005, 02:09:48 UTC |
| 9843c30 | Paul Mackerras | 30 August 2005, 00:57:11 UTC | Draw selected graph line thicker and make arrowheads active. | 30 August 2005, 00:57:11 UTC |
| f85a419 | Junio C Hamano | 30 August 2005, 00:21:06 UTC | Accumulated documentation updates. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 00:21:06 UTC |
| d5acdcf | Junio C Hamano | 29 August 2005, 17:29:53 UTC | git-repack-script: Add option to repack all objects. This originally came from Frank Sorenson, but with a bit of rework to allow future enhancements without changing the external interface for pack pruning part. With the '-a' option, all objects in the current repository are packed into a single pack. When the '-d' option is given at the same time, existing packs that were made redundant by this round of repacking are deleted. Since we currently have only two repacking strategies, one with '-a' (everything into one) and the other without '-a' (incrementally pack only the unpacked ones), the '-d' option is meaningful only when used with '-a'; it removes the packs existed before we did the "everything into one" repacking. At least for now. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Frank Sorenson <frank@tuxrocks.com> (cherry picked from bfed505327e31221d8de796b3af880bad696b149 commit) | 30 August 2005, 00:20:07 UTC |
| 8e5dd22 | Junio C Hamano | 30 August 2005, 00:19:47 UTC | Updates: show-branch Earlier show-branch gave names only to commits reachable via first parent ancestry chain. Change the naming code to name everybody. The original idea was to stop at the first merge point in the topological order, and --more=<n> to show commits until we show <n> more extra merge points. However depending on the order of how we discover the commits, it additionally showed parents of the <n>th merge points, which was unnecessary. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 August 2005, 00:19:47 UTC |
| 5dd02f9 | Junio C Hamano | 29 August 2005, 20:07:55 UTC | Merge refs/heads/master from . | 29 August 2005, 20:07:55 UTC |
| d4a9ce7 | Junio C Hamano | 28 August 2005, 19:33:16 UTC | mailinfo and applymbox updates This attempts to minimally cope with a subset of MIME "features" often seen in patches sent to our mailing lists. Namely: - People's name spelled in characters outside ASCII (both on From: header and the signed-off-by line). - Content-transfer-encoding using quoted-printable (both in multipart and non-multipart messages). These MIME features are detected and decoded by "git mailinfo". Optionally, with the '-u' flag, the output to .info and .msg is transliterated from its original chaset to utf-8. This is to encourage people to use utf8 in their commit messages for interoperability. Applymbox accepts additional flag '-u' which is passed to mailinfo. Signed-off-by: Junio C Hamano / 濱野 純 <junkio@cox.net> | 29 August 2005, 19:52:05 UTC |
| de2b82c | Junio C Hamano | 28 August 2005, 10:01:09 UTC | Document "git cherry-pick" and "git revert" Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 August 2005, 19:52:03 UTC |
| e47e35a | Junio C Hamano | 27 August 2005, 00:27:07 UTC | Remove git-apply-patch-script. Now the rebase is rewritten to use git cherry-pick, there is no user for that ancient script. I've checked Cogito and StGIT to make sure they do not use it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 August 2005, 19:52:03 UTC |
| 4831359 | Junio C Hamano | 28 August 2005, 06:53:27 UTC | Redo "revert" using three-way merge machinery. The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own commit ancestry chain to the current tree. Revert applies the diff in reverse while cherry-pick applies it forward. They share the same logic, just different messages and merge direction. Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 August 2005, 19:52:02 UTC |
| 2c04662 | Junio C Hamano | 29 August 2005, 19:41:03 UTC | Revert "Replace zero-length array decls with []." This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit, whose change breaks gcc-2.95. Not that I ignore portability to compilers that are properly C99, but keeping compilation with GCC working is more important, at least for now. We would probably end up declaring with "name[1]" and teach the allocator to subtract one if we really aimed for portability, but that is left for later rounds. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 August 2005, 19:41:03 UTC |
| 8c1f5f0 | Junio C Hamano | 29 August 2005, 06:03:23 UTC | Merge refs/heads/master from . | 29 August 2005, 06:03:23 UTC |
| 10d781b | Junio C Hamano | 29 August 2005, 06:02:01 UTC | Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git | 29 August 2005, 06:02:01 UTC |
| 928f74d | Amos Waterland | 29 August 2005, 04:05:36 UTC | [PATCH] tutorial note about git branch Explain that an asterisk will be displayed in front of the current branch when you run `git branch' to see which are available. Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 August 2005, 04:34:28 UTC |
| 933693d | Junio C Hamano | 29 August 2005, 00:57:45 UTC | Merge refs/heads/master from . | 29 August 2005, 00:57:45 UTC |
| 9847f7e | Junio C Hamano | 29 August 2005, 00:54:18 UTC | Update SubmittingPatches. - It does not matter how I read git list. What matters is that I do not necessarily read everything on it. - Talk a bit about how to use applymbox to check one's own patches. - Talk a bit about PGP signed patches. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 August 2005, 00:54:18 UTC |
| a698baf | A Large Angry SCM | 28 August 2005, 21:17:15 UTC | [PATCH] Add footnote about Thunderbird about trimming trailing WS. Add footnote about Thunderbird about trimming trailing WS. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 21:32:39 UTC |
| f58b743 | A Large Angry SCM | 28 August 2005, 21:16:01 UTC | [PATCH] Add some documentation. Add some documentation. Text taken from the the commit messages and the command sources. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 21:32:30 UTC |
| debb9d8 | Robert Fitzsimons | 28 August 2005, 15:25:10 UTC | [PATCH] New git-apply test cases for scanning forwards and backwards. Added a new test case for the scanning forwards and backwards for the correct location to apply a patch fragment. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 21:24:06 UTC |
| ff3412e | Robert Fitzsimons | 28 August 2005, 15:25:06 UTC | [PATCH] New git-apply test cases for patches with mulitple fragments. Added a test case for patches with multiple fragments. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 21:24:05 UTC |
| e70a165 | Robert Fitzsimons | 28 August 2005, 15:24:27 UTC | [PATCH] Fix git patch header processing in git-apply. Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 21:24:01 UTC |
| ba966b9 | Junio C Hamano | 26 August 2005, 09:12:50 UTC | Teach git-status-script about git-ls-files --others When there is non-empty $GIT_DIR/info/exclude file, use it along with .gitignore per-directory exclude pattern files (which was a convention agreed on the list while ago and is compatible with Cogito) to generate a list of ignored files as well. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit) | 28 August 2005, 19:15:10 UTC |
| 9804b7d | Junio C Hamano | 26 August 2005, 23:53:26 UTC | Show the branch name more prominently in "git status". When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 19:15:09 UTC |
| 9a9cbb6 | Junio C Hamano | 26 August 2005, 17:37:17 UTC | Barf nicely when "git push" is run without parameter. Saying "internal error" makes it look like my fault ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 19:14:30 UTC |
| 5f5608b | Linus Torvalds | 27 August 2005, 20:54:42 UTC | [PATCH] Make .git directory validation code test HEAD Inspired by a report by Kalle Valo, this changes git-sh-setup-script and the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a symlink, since a number of core git features depend on that these days. We used to allow a regular file there, but git-fsck-cache has been complaining about that for a while, and anything that uses branches depends on the HEAD file being a symlink, so let's just encode that as a fundamental requirement. Before, a non-symlink HEAD file would appear to work, but have subtle bugs like not having the HEAD show up as a valid reference (because it wasn't under "refs"). Now, we will complain loudly, and the user can fix it up trivially instead of getting strange behaviour. This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY" being directories, since the other tests will implicitly test for that anyway (ie the tests for HEAD, refs and 00 would fail). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 August 2005, 06:20:24 UTC |
| 9740d28 | Junio C Hamano | 27 August 2005, 06:53:07 UTC | Update SubmittingPatches to add MUA specific notes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 06:53:07 UTC |
| 0f58317 | Junio C Hamano | 27 August 2005, 05:47:27 UTC | Merge master branch changes into release candidate branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 05:47:27 UTC |
| aba2da1 | Junio C Hamano | 26 August 2005, 01:57:35 UTC | Accept -m and friends for initial commits and merge commits. Yes it was irritating not to be able to do so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 05:36:54 UTC |
| 7311d9f | Junio C Hamano | 27 August 2005, 05:35:45 UTC | Add how-to on using update-hook. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 05:35:45 UTC |
| b10ac50 | Junio C Hamano | 26 August 2005, 01:15:32 UTC | Fix pulling into the same branch. When the "git pull" command updates the branch head you are currently on, before doing anything else, first update your index file and the working tree contents to that of the new branch head. Otherwise, the later resolving steps would think your index file is attempting to revert the change between the original head commit and the updated head commit. It uses two-tree fast-forward form of "read-tree -m -u" to prevent losing whatever local changes you may have in the working tree to do this update. I think this would at least make things safer (a lot safer), and prevent mistakes. Also "git fetch" command is forbidden from fetching and fast forwarding the current branch head unless --update-head-ok flag is given. "git pull" passes the flag when it internally calls "git fetch". Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 05:06:17 UTC |
| 90bc118 | Junio C Hamano | 25 August 2005, 23:31:43 UTC | Enable git-send-email-script on Debian. You can define WITH_SEND_EMAIL to include the send-email command as part of the installation. Since Debian, unlike RPM/Fedora, has the two necessary Perl modules available as part of the mainline distribution, there is no reason for us to shy away from shipping send-email. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 04:46:32 UTC |
| 905197d | Junio C Hamano | 27 August 2005, 04:33:46 UTC | Update the main documentation index. Gitzilla updated bunch of undocumented command pages, so move the entries in the main documentation index around to put them in proper category. Ordering within category will be fixed later. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 August 2005, 04:33:46 UTC |
| 52a22d1 | A Large Angry SCM | 27 August 2005, 01:18:48 UTC | [PATCH] Subject: [PATCH] Add some documentation. Add some documentation. Text taken from the the commit messages and the command sources. | 27 August 2005, 03:53:50 UTC |
