This would be used in places where we require a clean tree, such
as reverting and rebasing.
Signed-off-by: Junio C Hamano [EMAIL PROTECTED]
---
git-sh-setup-script | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
1de6046ded332e2278320be314f7a5e31a431e14
diff --git
On 8/26/05, Junio C Hamano [EMAIL PROTECTED] wrote:
their core GIT tools come from. But how would _I_ pull from
that My Project, if I did not want to pull unrelated stuff in?
and then...
What I think _might_ deserve a bit more support would be a merge
of a foreign project as a subdirectory
Daniel Barkalow [EMAIL PROTECTED] writes:
I've started this, and have gotten as far as having read-tree accept 3
trees and ignore everything but the last 3. Am I correct in assuming that
if I break read-tree in any way, some test will fail?
If some test fails you would know you broke it, but
Hi,
I'm off to the beach for the next two weeks, so if somebody wants to
munge cvs2git into svn2git, here's the basics on how to pull from a
remote SVN repo:
#!/usr/bin/perl
use strict;
use warnings;
use SVN::Core;
use SVN::Ra;
my(@new,@del,@mod);
sub show_log {
my ($changed_paths,
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 [EMAIL PROTECTED]
---
commit 62e16702fdb0cdc13822470f3a19b36956fd0d78
tree bf96bcbdf1ca99390e6d6cb894da8384270c585f
parent
Ignore more generated files.
Signed-off-by: Tommi Virtanen [EMAIL PROTECTED]
---
commit 91aeeed108292bb42f7b133da13ec6881cf84a9e
tree fd0dc430a655fde2a21a9634c914b22db0ee96ce
parent c1970992d81e2c26d2d85ad65b0e2e90fbeee7f1
author Tommi Virtanen [EMAIL PROTECTED] Fri, 26 Aug 2005 13:34:07 +0300
On Fri, Aug 26, 2005 at 07:16:05PM +0800, Sham Chukoury wrote:
G'day.
I figured you folks might be interested in a number of modifications the
XMMS2 team have made to gitweb. All the changes can be seen at
http://git.xmms.se
1) Navbar refactoring (gitweb-xmms2navbar.diff)
3) Snapshot
Hi,
On Thu, 25 Aug 2005, Junio C Hamano wrote:
This patch is to show my current thinking. Please let me know
what you think.
I like it. As Linus stated, the index originally had a different role from
what it has now, so it really should be an internal git thing, i.e. the
git user should
Martin Langhoff [EMAIL PROTECTED] writes:
On 8/26/05, Eric W. Biederman [EMAIL PROTECTED] wrote:
Thinking about it going from arch to git should be just a matter
of checking sha1 hashes, possibly back to the beginning of the
arch tree.
Yup, though actually replaying the tree to compute the
Junio C Hamano [EMAIL PROTECTED] writes:
Documentation
-
A nit but possibly an important for 1.0 there are
quite a few git commands that don't have man pages
or whose man pages are currently very poor.
Getting the code sane and stable of course comes first
but if people can't
[EMAIL PROTECTED] (Eric W. Biederman) writes:
A nit but possibly an important for 1.0 there are
quite a few git commands that don't have man pages
or whose man pages are currently very poor.
Getting the code sane and stable of course comes first
but if people can't figure out how to use
Johannes Schindelin [EMAIL PROTECTED] writes:
I like it. As Linus stated, the index originally had a different role from
what it has now, so it really should be an internal git thing, i.e. the
git user should not expect the index not to change when pulling.
Actually the issue and the way
I am tempted to move this logic to git fetch instead, because
it has the same issue. Tony's linus branch example has been
updated to do a git fetch instead of git pull from the
earlier description in his howto, but if he happens to be on the
linus branch, he would still have this same problem.
I
Marco Costalba [EMAIL PROTECTED] writes:
01168c6044e7ebb570e851b4707b4fe0c7f40c15
diff --git a/templates/blt/description b/templates/blt/description
Could I please see output of the following command in your
repository?
$ git whatchanged 01168c6044e7ebb570e851b4707b4fe0c7f40c15 templates/
On Fri, Aug 26, 2005 at 04:48:32PM -0400, Daniel Barkalow wrote:
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
I will try to describe how the algorithm works. The problem with the
usual 3-way merge algorithm is that we sometimes do not have a unique
common ancestor. In [1] B and C seems to
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
In real numbers it is as follows: In Linus' kernel tree there are
5996 commits. 400 of those have more than one parent. Of those 400
merge commits 4 have more than one shared head.
Ok, that's already interesting in itself. I was wanting to re-run
Linus Torvalds [EMAIL PROTECTED] writes:
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
In real numbers it is as follows: In Linus' kernel tree there are
5996 commits. 400 of those have more than one parent. Of those 400
merge commits 4 have more than one shared head.
Ok, that's already
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 [EMAIL PROTECTED]
---
Documentation/git-apply-patch-script.txt | 32
The pages under http://www.kernel.org/pub/software/scm/git/docs/
are built from Documentation/ directory of the git.git project
and needed to be kept up-to-date. The www.kernel.org/ servers
are mirrored and I was told that the origin of the mirror is on
the machine master.kernel.org, on which I
Add some documentation.
Text taken from the the commit messages and the command sources.
---
I made no attempt to use the proper terminology, as defined by the new
glossary, but instead used the text from the original commit messages and/or
the program source.
These are some of the easy ones.
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
Rewrite git rebase using git cherry-pick.
Signed-off-by: Junio C Hamano [EMAIL PROTECTED]
---
git-rebase-script | 16 ++--
1 files changed, 10 insertions(+), 6 deletions(-)
913404ae6371857c21c696cc3d8b0a04421fdeb2
diff --git a/git-rebase-script b/git-rebase-script
---
On Fri, Aug 26, 2005 at 06:08:33PM -0700, Junio C Hamano wrote:
Linus Torvalds [EMAIL PROTECTED] writes:
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
In real numbers it is as follows: In Linus' kernel tree there are
5996 commits. 400 of those have more than one parent. Of those 400
Luck, Tony [EMAIL PROTECTED] writes:
In the meantime, warning the user about the issue and suggesting
how to do the fast-forwarding of the working tree himself in the
warning message might be the safest and the most sensible thing
to do.
Yes please ... a big fat warning with coloured flashing
John Ellson [EMAIL PROTECTED] writes:
Do git and cogito build easily on Mac OS/X now? Are there
binaries available anywhere?
Not that I know of. We used to get portability patches from
Darwin folks, but I haven't seen any lately.
I am somewhat interested in what portability glitches we
tree 01d66754d441b84cb09fe28f875cbb47b3b9fb0c
parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf
author Patrick McHardy [EMAIL PROTECTED] Wed, 24 Aug 2005 12:06:09 -0700
committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 12:06:09 -0700
[FIB_TRIE]: Don't ignore negative results from
tree 3984a1dc8378d7a976be60523021036c8265a167
parent 06c7427021f1cc83703f14659d8405ca773ba1ef
author Michael Chan [EMAIL PROTECTED] Fri, 26 Aug 2005 05:31:41 -0700
committer David S. Miller [EMAIL PROTECTED] Fri, 26 Aug 2005 05:31:41 -0700
[TG3]: Fix ethtool loopback test lockup
The
tree 2fff144b1b85cdf362c1a774e77b34f204b93ebf
parent fd589e0b662c1ea8cfb1e0d20d60a2510979865b
author Steve French [EMAIL PROTECTED] Sat, 27 Aug 2005 00:42:59 -0500
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 06:05:35 -0700
[PATCH] Fix oops in fs/locks.c on close of file with
tree 0db3419ab73cabed542a18cd5c7da50b03df896c
parent d634cc15e8f2038dc9c078beae79f9382ada
author Alexey Dobriyan [EMAIL PROTECTED] Fri, 26 Aug 2005 01:49:14 +0400
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 06:30:30 -0700
[PATCH] drivers/hwmon/*: kfree() correct pointers
The
tree 1d6d1e779fcbaed6f06bf49ed4ad630ecdf58ed1
parent 1f57ff89fee47a317e9e8ca63bf0f139802cc116
author Al Viro [EMAIL PROTECTED] Thu, 25 Aug 2005 22:59:48 +0100
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 06:30:30 -0700
[PATCH] bogus iounmap() in emac
Dumb typo:
tree c550c6ef8439e867ea2f73aebfca0fca0e09b64a
parent b6a9ad73897acb7ea4cf56aae0fc39ba1c471fba
author Al Viro [EMAIL PROTECTED] Thu, 25 Aug 2005 23:03:35 +0100
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 06:30:30 -0700
[PATCH] bogus function type in qdio
In qdio_get_micros()
tree b88e2d0d55bbc9788337c256dfd25b54d684e49e
parent 32818c2eb6b83ea5065c89e0c3cf774abc4dc02b
author Mark M. Hoffman [EMAIL PROTECTED] Sat, 27 Aug 2005 08:34:08 -0700
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 09:37:12 -0700
[PATCH] I2C hwmon: kfree fixes
This patch fixes
tree c75562513489f62c8dcfd41acd467bca3d3202cc
parent bebf4688e9dbbfdd421736685d607bced91a3c91
author Andi Kleen [EMAIL PROTECTED] Sat, 27 Aug 2005 08:34:10 -0700
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 09:37:12 -0700
[PATCH] x86_64: Tell VM about holes in nodes
Some nodes can
tree 662163e453ee6514a13e844993700e96baa09260
parent 485761bd6a72d33b3d4fa884927b2b0d983b701e
author Deepak Saxena [EMAIL PROTECTED] Sat, 27 Aug 2005 08:34:11 -0700
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 09:37:12 -0700
[PATCH] arm: fix IXP4xx flash resource range
We are
tree 01c6de89a3d60c35d2133c0b6b1903509a8f1df8
parent 1c9cf6f9861f8d27303ee2531b3b7686269c71ce
author Roland Dreier [EMAIL PROTECTED] Sat, 27 Aug 2005 08:34:14 -0700
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 09:37:12 -0700
[PATCH] IB: fix use-after-free in user verbs cleanup
Fix
tree 23660dd9234016c927b8c135c9e48b685cb16207
parent e1bcfcaa0b3bec2a67b22c565a0bf508ea90db1d
author NeilBrown [EMAIL PROTECTED] Sat, 27 Aug 2005 08:34:15 -0700
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 09:37:12 -0700
[PATCH] md: create a MODULE_ALIAS for md corresponding to its
tree 35b09cbecef683302adaddb9e8f7047462e7a848
parent 72008652dae7d10fa668d7b2ada3bddff7403d86
author NeilBrown [EMAIL PROTECTED] Sat, 27 Aug 2005 08:34:16 -0700
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 09:37:13 -0700
[PATCH] md: clear the 'recovery' flags when starting an md
tree 5e1ae11c320ea00488b33224cc982d0be2d986d6
parent 755528c860b05fcecda1c88a2bdaffcb50760a7f
author John McCutchan [EMAIL PROTECTED] Fri, 26 Aug 2005 22:02:04 -0400
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 01:32:57 -0700
[PATCH] Document idr_get_new_above() semantics, update
tree 80a3d59724cc0faf0a5cb07f7e426c9f41d87e67
parent 7c657f2f25d50c602df9291bc6242b98fc090759
author Paolo 'Blaisorblade' Giarrusso [EMAIL PROTECTED] Fri, 26 Aug 2005
16:57:44 +0200
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 01:39:19 -0700
[PATCH] Fixup symlink function pointers
tree 5c281ab99184fa6dcfb09586064ea7751c32fd4c
parent d7a60d50d7713b65a3fd88f11d5717b83a6b6a97
author Paolo 'Blaisorblade' Giarrusso [EMAIL PROTECTED] Fri, 26 Aug 2005
16:57:53 +0200
committer Linus Torvalds [EMAIL PROTECTED] Sat, 27 Aug 2005 01:39:19 -0700
[PATCH] hppfs: fix symlink error path
40 matches
Mail list logo