aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Redo "revert" using three-way merge machinery.Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | 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>
* Revert "Replace zero-length array decls with []."Junio C Hamano2005-08-29
| | | | | | | | | | | | | 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>
* Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git Junio C Hamano2005-08-28
|\
| * Replace C99 array initializers with code.Jason Riedy2005-08-23
| | | | | | | | | | | | | | The only use of C99 array initializers is in ident.c, so just replace it with initializing code. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
| * Replace unsetenv() and setenv() with older putenv().Jason Riedy2005-08-23
| | | | | | | | | | | | | | | | | | | | | | Solaris 8 doesn't have the newer unsetenv() and setenv() functions, so replace them with putenv(). The one use of unsetenv() in fsck-cache.c now sets GIT_ALTERNATE_OBJECT_ DIRECTORIES to the empty string. Every place that var is used, NULLs are also replaced with empty strings, so it's ok. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
| * Include sys/time.h in daemon.c.Jason Riedy2005-08-23
| | | | | | | | | | | | | | Some systems and feature levels want sys/time.h for fd_set functionality. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
| * Fix ?: statements.Jason Riedy2005-08-23
| | | | | | | | | | | | | | | | | | Omitting the first branch in ?: is a GNU extension. Cute, but not supported by other compilers. Replaced mostly by explicit tests. Calls to getenv() simply are repeated on non-GNU compilers. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
| * Replace zero-length array decls with [].Jason Riedy2005-08-23
| | | | | | | | | | | | C99 denotes variable-sized members with [], not [0]. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
* | [PATCH] tutorial note about git branchAmos Waterland2005-08-28
| | | | | | | | | | | | | | | | 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>
* | Update SubmittingPatches.Junio C Hamano2005-08-28
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | [PATCH] Add footnote about Thunderbird about trimming trailing WS.A Large Angry SCM2005-08-28
| | | | | | | | | | | | | | Add footnote about Thunderbird about trimming trailing WS. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Add some documentation.A Large Angry SCM2005-08-28
| | | | | | | | | | | | | | | | | | 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>
* | [PATCH] New git-apply test cases for scanning forwards and backwards.Robert Fitzsimons2005-08-28
| | | | | | | | | | | | | | | | 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>
* | [PATCH] New git-apply test cases for patches with mulitple fragments.Robert Fitzsimons2005-08-28
| | | | | | | | | | | | | | 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>
* | [PATCH] Fix git patch header processing in git-apply.Robert Fitzsimons2005-08-28
| | | | | | | | | | | | | | | | 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>
* | Teach git-status-script about git-ls-files --othersJunio C Hamano2005-08-28
| | | | | | | | | | | | | | | | | | | | 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)
* | Show the branch name more prominently in "git status".Junio C Hamano2005-08-28
| | | | | | | | | | | | | | 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>
* | Barf nicely when "git push" is run without parameter.Junio C Hamano2005-08-28
| | | | | | | | | | | | Saying "internal error" makes it look like my fault ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Make .git directory validation code test HEADLinus Torvalds2005-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update SubmittingPatches to add MUA specific notes.Junio C Hamano2005-08-26
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Accept -m and friends for initial commits and merge commits.Junio C Hamano2005-08-26
| | | | | | | | | | | | Yes it was irritating not to be able to do so. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add how-to on using update-hook.Junio C Hamano2005-08-26
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix pulling into the same branch.Junio C Hamano2005-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Enable git-send-email-script on Debian.Junio C Hamano2005-08-26
| | | | | | | | | | | | | | | | | | | | 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>
* | Update the main documentation index.Junio C Hamano2005-08-26
| | | | | | | | | | | | | | | | 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>
* | [PATCH] Subject: [PATCH] Add some documentation.A Large Angry SCM2005-08-26
| | | | | | | | | | | | Add some documentation. Text taken from the the commit messages and the command sources.
* | [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | Point Debian doc-base at the right files. Clean up. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | Ignore generated files. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | Generate docs for gitk. Install them in the right deb package. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | | | Make the git deb conflict with cogito versions prior to 0.13, as those versions used to contain git. Suggest cogito. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | | | Fix syntax error in debian Build-Depends-Indep, dpkg-checkbuilddeps used to give false ok results. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add Abstract: support for howto index generator.Junio C Hamano2005-08-26
| | | | | | | | | | | | Maybe it's time for me to really learn asciidoc. Also I should do Perl ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] More missing terms in glossary.txtJohannes Schindelin2005-08-26
| | | | | | | | | | | | | | Describe a DAG and octopus, and change wording of tree object. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] update howto/using-topic-branches.txttony.luck@intel.com2005-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | Various updates and cleanups for my howto on using branches in GIT as a Linux subsystem maintainer. Three categories of changes: 1) Updates for new features in GIT 0.99.5 2) Changes to use "git fetch" rather than "git pull" to update local linus branch. 3) Cleanups suggested by Len Brown Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Don't forget to build the howto-index file.Junio C Hamano2005-08-25
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Link howto documents from the main git.txt documentation.Junio C Hamano2005-08-25
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Sort branch names snarfed from refs/ hierarchy.Junio C Hamano2005-08-24
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix fetching of tags.Junio C Hamano2005-08-24
| | | | | | | | | | | | "git fetch tag <tag>" stored a tag after dereferencing. Bad. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge refs/heads/master from . v0.99.5Junio C Hamano2005-08-24
|\ \
| * | [PATCH] Fix silly pathspec bug in git-ls-filesLinus Torvalds2005-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The "verify_pathspec()" function doesn't test for ending NUL character in the pathspec, causing some really funky and unexpected behaviour. It just happened to work in the cases I had tested. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | [PATCH] Fix git-checkout-script exit statustony.luck@intel.com2005-08-24
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes the git-read-tree in git-checkout-script fails for me. Make sure that the failed status is passed up to caller. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge refs/heads/master from . Junio C Hamano2005-08-24
|\ \ \ | |/ /
| * | Fix markup minimally to get man pages built.Junio C Hamano2005-08-24
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge refs/heads/master from . Junio C Hamano2005-08-24
|\ \ \ | |/ /
| * | Update tutorial to describe shared repository style a bit more.Junio C Hamano2005-08-24
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Documentation: multi-head fetch.Junio C Hamano2005-08-24
| | | | | | | | | | | | | | | | | | | | | Add documentation related to multi-head work, including $GIT_DIR/remotes/ changes. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Support +<src>:<dst> format in push as well.Junio C Hamano2005-08-24
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | [PATCH] Allow "+remote:local" refspec to cause --force when fetching.Junio C Hamano2005-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this we could say: Pull: master:ko-master +pu:ko-pu to mean "fast forward ko-master with master, overwrite ko-pu with pu", and the latter one does not require the remote "pu" to be descendant of local "ko-pu". Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | [PATCH] Use git-octopus when pulling more than one heads.Junio C Hamano2005-08-24
| | | | | | | | | | | | | | | | | | With this, you can finally say "git pull jgarzik sil24 pdc2027x". Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | [PATCH] "git fetch --force".Junio C Hamano2005-08-24
| | | | | | | | | | | | | | | | | | | | | Just like "git push" can forcibly update a ref to a value that is not a fast-forward, teach "git fetch" to do so as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 14:16:28 +0000