- 30 8月, 2005 6 次提交
-
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano / 濱野 純 <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
This reverts 6c5f9baa 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: NJunio C Hamano <junkio@cox.net>
-
- 29 8月, 2005 11 次提交
-
-
-
由 Amos Waterland 提交于
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: NAmos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
- 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: NJunio C Hamano <junkio@cox.net>
-
由 A Large Angry SCM 提交于
Add footnote about Thunderbird about trimming trailing WS. Signed-off-by: N <gitzilla@gmail.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 A Large Angry SCM 提交于
Add some documentation. Text taken from the the commit messages and the command sources. Signed-off-by: N <gitzilla@gmail.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Robert Fitzsimons 提交于
Added a new test case for the scanning forwards and backwards for the correct location to apply a patch fragment. Signed-off-by: NRobert Fitzsimons <robfitz@273k.net> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Robert Fitzsimons 提交于
Added a test case for patches with multiple fragments. Signed-off-by: NRobert Fitzsimons <robfitz@273k.net> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Robert Fitzsimons 提交于
Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: NRobert Fitzsimons <robfitz@273k.net> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net> (cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit)
-
由 Junio C Hamano 提交于
When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Saying "internal error" makes it look like my fault ;-). Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 28 8月, 2005 1 次提交
-
-
由 Linus Torvalds 提交于
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: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 27 8月, 2005 14 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Yes it was irritating not to be able to do so. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net>
-
由 A Large Angry SCM 提交于
Add some documentation. Text taken from the the commit messages and the command sources.
-
由 Tommi Virtanen 提交于
Point Debian doc-base at the right files. Clean up. Signed-off-by: NTommi Virtanen <tv@debian.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Tommi Virtanen 提交于
Ignore generated files. Signed-off-by: NTommi Virtanen <tv@debian.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Tommi Virtanen 提交于
Generate docs for gitk. Install them in the right deb package. Signed-off-by: NTommi Virtanen <tv@debian.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Tommi Virtanen 提交于
Make the git deb conflict with cogito versions prior to 0.13, as those versions used to contain git. Suggest cogito. Signed-off-by: NTommi Virtanen <tv@debian.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Tommi Virtanen 提交于
Fix syntax error in debian Build-Depends-Indep, dpkg-checkbuilddeps used to give false ok results. Signed-off-by: NTommi Virtanen <tv@debian.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Maybe it's time for me to really learn asciidoc. Also I should do Perl ;-). Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Johannes Schindelin 提交于
Describe a DAG and octopus, and change wording of tree object. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 26 8月, 2005 1 次提交
-
-
由 tony.luck@intel.com 提交于
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: NTony Luck <tony.luck@intel.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 25 8月, 2005 7 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
"git fetch tag <tag>" stored a tag after dereferencing. Bad. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
-
由 Linus Torvalds 提交于
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: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 tony.luck@intel.com 提交于
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: NTony Luck <tony.luck@intel.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-