Although it is uncertain if we would keep .git/branches for
long, the shorthand stored there can be used for pushing if it
is host:path/to/git format, so let's make use of it. This does
not use git-parse-remote because that script will be rewritten
quite a bit for updated pulling.
Signed-off-by:
Although these commands take only begin and end, not necessarily
generic SHA1 expressions rev-parse supports, supporting a..b
notation is good for consistency. This commit adds such without
breaking backward compatibility.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Unlike the outline
When rewinding the head, stash away the value of the original
HEAD in ORIG_HEAD, just like git-resolve-script does.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Since rewinding the head is a dangerous operation, saving it
somewhere just in case would make life a bit safer. This also
let
My proposed patch, the description as is is misleading.
The rest of the .spec file looks sane (yes, I've built my share of RPMs
over the years).
diff --git a/git-core.spec.in b/git-core.spec.in
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -2,7 +2,7 @@
Name: git-core
Version:
Linus Torvalds wrote:
This adds a useful "Parent:" line to the git commit information window.
It looks something like this (from the infamous octopus merge):
Author: Junio C Hamano <[EMAIL PROTECTED]> 2005-05-05 16:16:54
Committer: Junio C Hamano <[EMAIL PROTECTED]> 2005-05-05
Paul Mackerras <[EMAIL PROTECTED]> writes:
> Linus Torvalds writes:
>
>> This adds a useful "Parent:" line to the git commit information window.
>
> Cool! Applied and pushed out.
Thanks. Merged and pushed out.
> I have been thinking about adding dialog windows to allow the user to
> select whi
Paul Mackerras wrote:
...
I have been thinking about adding dialog windows to allow the user to
select which repository and which range of commits they want to look at.
Do you think that would be useful for you?
Yes!
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body o
Linus Torvalds writes:
> This adds a useful "Parent:" line to the git commit information window.
Cool! Applied and pushed out.
I have been thinking about adding dialog windows to allow the user to
select which repository and which range of commits they want to look at.
Do you think that would b
Marco Costalba <[EMAIL PROTECTED]> writes:
> A suggestion I would like to present is if can be useful a
> kind of scheduling/list of planned compatibility break features so
> that developers can know in advance when and what will break
> their stuff and users can know when they will need to upgr
Linus Torvalds <[EMAIL PROTECTED]> writes:
> [ Btw, the patch was generated against a tree that had Paul's hovering
> patches merged. Junio, I don't think you've merged that yet, so this may
> apply better to Paul's tree than to standard git. But I _think_ it will
> apply cleanly to eithe
This adds a useful "Parent:" line to the git commit information window.
It looks something like this (from the infamous octopus merge):
Author: Junio C Hamano <[EMAIL PROTECTED]> 2005-05-05 16:16:54
Committer: Junio C Hamano <[EMAIL PROTECTED]> 2005-05-05 16:16:54
Paren
Junio C Hamano wrote:
>
>I am reluctant to actually do this right away, because this is
>an incompatible change from the current format:
>
>$ git format-patch his mine
>
Of course this breaks qgit interface to git-format-patch-script
but if you think it's better this way
>The same goes
On Sun, 7 Aug 2005, Junio C Hamano wrote:
>
> How about LAST_MERGE?
I don't think it matters. I kind of saw it as the "other side" of
ORIG_HEAD, but since we now clean it up and since I've never used it, I
think it falls under the status of "well-intentioned but useless".
Lin
Linus Torvalds <[EMAIL PROTECTED]> writes:
> In fact, ORIG_HEAD is _the_ most common head I use explicitly.
A. You are right.
How about LAST_MERGE?
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://
On Sun, 7 Aug 2005, Junio C Hamano wrote:
>
> Also ORIG_HEAD is probably redundant. After a successful
> automerge, the same information can be had by HEAD^1
Absolutely not.
You forgot about one of the most common merge cases: fast-forward.
In fact, ORIG_HEAD is _the_ most common head I use
[EMAIL PROTECTED] (Eric W. Biederman) writes:
> What format-patch does is currently is fine. If format-patch would
> simply notice the case and fail gracefully that would be sufficient to
> avoid giving false impressions.
Hmph. Since it uses merge-order, We should be able to change it
use the t
Junio C Hamano <[EMAIL PROTECTED]> writes:
> [EMAIL PROTECTED] (Eric W. Biederman) writes:
>
>> I was trying to help someone track down a bug that
>> occurred between linux-2.6.12 and linux-2.6.13-rc1.
>> Since it was very much an unknown where the problem
>> was introduced I decided to run git fo
[EMAIL PROTECTED] (Eric W. Biederman) writes:
> I was trying to help someone track down a bug that
> occurred between linux-2.6.12 and linux-2.6.13-rc1.
> Since it was very much an unknown where the problem
> was introduced I decided to run git format-patch
> so I could see what all of the differe
Sanjoy Mahajan <[EMAIL PROTECTED]> writes:
> I will redo those tests but rebuilding in place after each bisection
> (with -f added to all the git checkout uses in git-bisect-script) and
> see whether I get the same results. If I don't, it could be due to
> git or git-bisect (but not so likely wit
Marco Costalba wrote:
>Linus Torvalds wrote:
>
>
>>- Any chance of having a git archive of qgit? I realize that sourceforge
>> doesn't have git archives, but (a) maybe you can ask and (b) maybe
>> there are alternate places you could put it. It's just sad having to
>> download tar-balls.
>>
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Linus Torvalds wrote:
> Oh, and do people really care _that_ much when the change happened? That's
> a lot of screen real estate wasted on the date stamp of "last change". At
> least I can drag it to the right and hide it that way..
I fixed that her
Junio C Hamano writes:
> I did, and will push it out shortly, but I think you need this
> patch. To make later merges from you easier, I will not put
> this in my "master" branch.
I have committed this plus the hand cursor for the links plus a small
change to make gitk display commit messages co
Linus Torvalds writes:
> This makes the cursor change when you hover over a SHA1 link with the new
> "hypertext" gitk commit ID linking feature.
I committed something based on this but with extra stuff to make the
cursor changes work with the change from the normal cursor to the
watch cursor and
Linus Torvalds wrote:
>Ok, this is nicer than gitk, with the parents showing up in the commit
>message and thus easy to go to. You might add children too: it's not
>something git itself knows about intrisically, but since you've already
>built the graph, at least you see what children are part of
I haven't had a chance to investigate this much
yet but I have ran into a peculiar problem.
I was trying to help someone track down a bug that
occurred between linux-2.6.12 and linux-2.6.13-rc1.
Since it was very much an unknown where the problem
was introduced I decided to run git format-patch
s
25 matches
Mail list logo
