aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* mailsplit: allow feeding mbox from standard input.Junio C Hamano2005-10-06
| | | | | | | When mbox argument is missing, read the mailbox from the standard input. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Describe new options to git-format-patch and git-mailsplit.Junio C Hamano2005-10-06
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* mailsplit: -d<prec>Junio C Hamano2005-10-06
| | | | | | | Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-format-patch: --stdout option.Junio C Hamano2005-10-06
| | | | | | | | | This new flag generates the mbox formatted output to the standard output, instead of saving them into a file per patch and implies --mbox. It also fixes a corner case where the commit does not have *any* message. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clean mail files after dealing with them.Junio C Hamano2005-10-06
| | | | | | | | | | | When you are applying 200 mails in sequence, .dotest/ directory will be littered with many messsages, and when the patch in one of them fails to apply, it is not obvious which message was being processed. Remove the one that has been already dealt with, so that the last failed one is found typically as the lowest numbered split message. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fall back to three-way merge when applying a patch.Junio C Hamano2005-10-06
| | | | | | | | | | | | | | | After git-apply fails, attempt to find a base tree that the patch cleanly applies to, and do a three-way merge using that base tree into the current index, if .dotest/.3way file exists. This flag can be controlled by giving -m flag to git-applymbox command. When the fall-back merge fails, the working tree can be resolved the same way as you would normally hand resolve a conflicting merge. When making commit, use .dotest/final-commit as the log message template. Or you could just choose to 'git-checkout-index -f -a' to revert the failed merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Allow "-u" flag to tag signingLinus Torvalds2005-10-06
| | | | | | | | | | | | | | | | | | | | | | The current "git tag -s" thing always uses the tagger name as the signing user key, which is very irritating, since my key is under my email address, but the tagger key obviously contains the actual machine name too. Now, I could just use "GIT_COMMITTER_EMAIL" and force it to be my real email, but I actually think that it's nice to see which machine I use for my work. So rather than force my tagger ID to have to match the gpg key name, just support the "-u" flag to "git tag" instead. It implicitly enables signing, since it doesn't make any sense without it. Thus: git tag -u <gpg-key-name> <tag-name> [<tagged-object>] will use the named gpg key for signing. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not require ls-remote to be run inside a git repository.Alex Riesen2005-10-06
| | | | | | | The scripts work perfectly without a repository. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-shortlog: make the mailmap configurable.Junio C Hamano2005-10-06
| | | | | | | | In addition to hardcoded list of kernel people, read from .mailmap file the list of email-to-name translations. Modernize regexps here and there minimally while at it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'fixes'Junio C Hamano2005-10-05
|\
| * Fix usage of carets in git-rev-parse(1)Jonas Fonseca2005-10-05
| | | | | | | | | | | | | | ... but using a {caret} attribute. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * clone-pack: use create_symref() instead of raw symlink.Junio C Hamano2005-10-05
| | | | | | | | | | | | This was the last instance of symlink() in coreish part. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Some typos and light editing of various manpagesChristian Meder2005-10-05
| | | | | | | | | | | | | | Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * upload-pack: Do not choke on too many heads request.Junio C Hamano2005-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloning from a repository with more than 256 refs (heads and tags included) will choke, because upload-pack has a built-in limit of feeding not more than MAX_NEEDS (currently 256) heads to underlying git-rev-list. This is a problem when cloning a repository with many tags, like http://www.linux-mips.org/pub/scm/linux.git, which has 290+ tags. This commit introduces a new flag, --all, to git-rev-list, to include all refs in the repository. Updated upload-pack detects requests that ask more than MAX_NEEDS refs, and sends everything back instead. We may probably want to tweak the definitions of MAX_NEEDS and MAX_HAS, but that is a separate topic. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Quote the missing GIT_DIR.Santi_Béjar2005-10-05
| | | | | | | | | | Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Fix symbolic ref validationJonas Fonseca2005-10-05
| | | | | | | | | | | | | | Use the correct buffer when validating 'ref: refs/...' Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] hold_index_file_for_update should not unlink failed to open .lock ↵Alex Riesen2005-10-05
| | | | | | | | | | | | | | | | | | files atexit Set up atexit only if the .lock-file was opened successfully. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix diff-filter All-Or-None mark.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we updated the marker for new files from 'N' to 'A', we forgot to notice that the letter is already taken by the All-Or-None mark. Change the All-Or-None marker to '*' to resolve this conflict. git-diff-tree -r --diff-filter='R*' -M shows all the changes (not just renames) that are contained in commits that have renames, in comparison with: git-diff-tree -r --diff-filter='R' -M shows the same set of changes but the diff output are limited only to renaming changes. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Record which tree the patch applies to.Junio C Hamano2005-10-04
| | | | | | | | | | | | Also note which version of GIT produced the patch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-applypatch: cleanup.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | - Defined variable $INFO was not used properly. - Make sure there is an empty line between the sign-off and the log message. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-apply: retire unused/unimplemented --no-merge flag.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | The original plan was to do 3-way merge between local working tree, index and the patch being applied, but that was never implemented. Retire the flag to control its behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-apply: allow operating in sparsely populated working tree.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | This patch teaches 'git-apply --index' to automatically check out a file being patched. This happens only when the working tree does not have it checked out. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Return error when not checking out an entry due to dirtiness.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | | | Without -f flag, 'git-checkout-index foo.c' issued an error message when foo.c already existed in the working tree and did not match index. However it did not return an error from the underlying checkout_entry() function and resulted in a successful exit(0). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-10-04
|\ \ | |/
| * Add missing documentation.Junio C Hamano2005-10-04
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove useless use of sed in git-format-patch.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | | | There was a leftover use of sed that attempted to remove the commit ID output from git-diff-tree, which turned into an expensive no-op when git-diff-tree output header format changed about three months ago. Drop it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Leave an empty line between log and sign-off.Junio C Hamano2005-10-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove unused external-diff script.Junio C Hamano2005-10-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Limit the number of requests outstanding in ssh-fetch.Daniel Barkalow2005-10-03
| | | | | | | | | | | | | | | | This completes fetches if there are more than 100 outstanding requests and there are more to prefetch. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | On Cygwin, use symbolic ref, not a symbolic link, to express .git/HEADJunio C Hamano2005-10-03
| | | | | | | | | | | | | | | | | | | | | | H. Peter Anvin says that Samba "promotes" symlinks to hardlinks while Cygwin itself uses .lnk files to emulate symlinks. Avoid using symbolic link for .git/HEAD on Cygwin. This does not help the symlinks recorded in trees as user data, but at least we do not use them for our own bookkeeping. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-10-03
|\ \ | |/
| * Avoid compiler warning.Junio C Hamano2005-10-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make sure get_sha1 does not accept ambiguous sha1 prefix (again).Junio C Hamano2005-10-03
| | | | | | | | | | | | | | | | The earlier fix incorrectly dropped the code the original had to ensure the found SHA1 is at least unique within the same pack. Restore the check. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin2005-10-03
|\ \
| * \ Merge branch 'fixes'Junio C Hamano2005-10-03
| |\ \ | | |/
| | * git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano2005-10-03
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * [PATCH] Random documentation fixesJonas Fonseca2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preformatted text wrapped in lines with -----) for examples that span empty lines, so they are put in only one HTML block. - Use '1.' instead of '(1)' for numbered lists. - Fix linking to other GIT docs. - git-rev-list.txt: put option descriptions in an OPTION section. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Error message from get_sha1() on ambiguous short SHA1.Junio C Hamano2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike cases where "no such object exists", the case where specified prefix is ambiguous would confuse the user if we say "no such commit" or such. Give an extra error message from the uniqueness check if there are more than one objects that match the given prefix. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less merge of A and B. [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge. I fixed a small typo in git-merge-resolve fix; 'test' equality check is spelled with single equal sign -- C-style double equal sign is bashism.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Make sure get_sha1 does not accept ambiguous sha1 prefix.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | | | | | | | | | The original code did not even check alternates, and was confused if an unpacked object was uniquely found when there was another object that shares the same prefix in the pack. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Fix minor DOS in rev-list.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | | | | | | A carefully crafted pathname can be used to disrupt downstream git-pack-objects that uses 'git-rev-list --objects' output. Prevent this. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Merging the Cygwin changesJunio C Hamano2005-10-03
| | | | | | | | | | | | | | | | | | Fix mismerge typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin2005-10-03
|\ \ \ | |/ /
| * | Post 0.99.8 master branchJunio C Hamano2005-10-02
| |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * GIT 0.99.8v0.99.8Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | GIT already did everything I wanted it to do since mid 0.99.7, and it has almost everything I want it to have now, except a couple of minor tweaks and enhancements. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Update git-clone documentationEric W. Biederman2005-10-02
| | | | | | | | | | | | | | | | | | The documentation for git-clone is behind the actual command. I have been getting tired of reading the shell script to see what the arguments are so here is an update of the actual documentation. Signed-off-by: Eric Biederman <ebiederman@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Handle really trivial case inside git-merge.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * read-tree: --trivialLinus Torvalds2005-10-02
| | | | | | | | | | | | | | | | This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Teach git-ls-files about '--' to denote end of options.Fredrik Kuivinen2005-10-02
| | | | | | | | | | | | | | Useful if you have a file whose name starts with a dash. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen2005-10-02
| | | | | | | | | | | | | | | | | | It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-30 22:53:29 +0000