On Wed, Aug 08, 2012 at 10:52:58PM +, Eric Wong wrote:
Peter Baumann waste.mana...@gmx.de wrote:
On Tue, Aug 07, 2012 at 08:45:10PM +, Eric Wong wrote:
Peter Baumann waste.mana...@gmx.de wrote:
+ for my $suffix (qw(yaml db)) {
+
On Wed, Aug 8, 2012 at 11:13 PM, Junio C Hamano gits...@pobox.com wrote:
Forwarding a misdirected patch to the maintainer who is free to pick
or ignore.
How am I supposed to know if a patch has been ignored as an oversight
(in which case I would resend), or because the maintainer decided not
On Wed, Aug 8, 2012 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
I do not have a strong reason to vote for or against inclusion of
yet another tool as mergetool backends (read: Meh), but what this
That sounds almost as if you'd like to keep the number of directly
supported mergetools
Hi Junio,
The following changes since commit bfbf4d477a33be413800f531c3ac0d227f46ab44:
Merge git://github.com/git-l10n/git-po (2012-08-05 20:51:05 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
for you to fetch changes up to
Jeff King p...@peff.net writes:
These commands were never added to the command-list. Adding
them makes make check-docs run without complaint.
While we're at it, let's capitalize the first letter of
their one-line summaries to match the rest of the git
manpages.
You may want to squash my
git --version
git version 1.7.11.3
On Wed, Aug 8, 2012 at 9:54 PM, Jeff King p...@peff.net wrote:
On Wed, Aug 08, 2012 at 11:25:02AM +0400, Andrey Pavlenko wrote:
I'm developing a remote helper which uses the fast-import stream for
fetching. When I perform cloning git prints error message -
My helper really executes git show-ref before writting the export stream...
Thank you for pointing that out and sorry for disturbing.
On Thu, Aug 9, 2012 at 12:22 PM, Andrey Pavlenko
andrey.a.pavle...@gmail.com wrote:
git --version
git version 1.7.11.3
On Wed, Aug 8, 2012 at 9:54 PM, Jeff
On 08/08, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
So whether done with sleep or test-chmtime, avoiding a racily
clean situation sounds like sweeping a bug in the v5 code in racy
situation under the rug to me (unless I am misunderstanding what
you are doing with
Add test cases for 'git rebase --keep-empty' with and without an
empty commit already in upstream. The empty commit that is about to
be rebased should be kept in both cases.
Signed-off-by: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
---
Added another test for when the upstream already
Sebastian Schuberth sschube...@gmail.com writes:
On Wed, Aug 8, 2012 at 11:13 PM, Junio C Hamano gits...@pobox.com wrote:
Forwarding a misdirected patch to the maintainer who is free to pick
or ignore.
How am I supposed to know if a patch has been ignored as an oversight
(in which case I
Sebastian Schuberth sschube...@gmail.com writes:
On Wed, Aug 8, 2012 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
I do not have a strong reason to vote for or against inclusion of
yet another tool as mergetool backends (read: Meh), but what this
That sounds almost as if you'd like
On Thu, Aug 9, 2012 at 5:54 PM, Junio C Hamano gits...@pobox.com wrote:
Forwarding a misdirected patch to the maintainer who is free to pick
or ignore.
How am I supposed to know if a patch has been ignored as an oversight
(in which case I would resend), or because the maintainer decided not
On Thu, Aug 9, 2012 at 6:03 PM, Junio C Hamano gits...@pobox.com wrote:
I still agree that not listing all mergetools in multiple places is a
good thing. But doing the whole stuff of extending --tool-help for
git-mergetool and git-difftool to return a simple list that can be
used in
Thomas Gummerer t.gumme...@gmail.com writes:
On 08/08, Junio C Hamano wrote:
...
Let me ask the same question in a more direct way. Which part of
this test break with your series?
test_expect_success 'git add --refresh with pathspec' '
git reset --hard
Michael J Gruber g...@drmicha.warpmail.net writes:
'git rebase' uses the full onto sha1 for the reflog message whereas 'git
rebase -i' uses the short sha1. This is not only inconsistent, but can
lead to problems when the reflog is inspected at a later time at which
that abbreviation may have
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
Add test cases for 'git rebase --keep-empty' with and without an
empty commit already in upstream. The empty commit that is about to
be rebased should be kept in both cases.
Signed-off-by: Martin von Zweigbergk
Eric Wong normalper...@yhbt.net writes:
Robert Luberda rob...@debian.org wrote:
Eric Wong wrote:
+ echo PATH=\$PATH\; export PATH $hook
+ echo svnconf=\$svnconf\ $hook
+ cat $hook - 'EOF2'
+ cd work-auto-commits.svn
+ svn up
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
On Thu, Aug 9, 2012 at 9:05 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0d2056f..dbc9de6 100644
--- a/git-rebase--interactive.sh
+++
Jiang Xin worldhello@gmail.com writes:
Hi Junio,
The following changes since commit bfbf4d477a33be413800f531c3ac0d227f46ab44:
Merge git://github.com/git-l10n/git-po (2012-08-05 20:51:05 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
for
Thomas Hochstein t...@inter.net:
Randal L. Schwartz schrieb:
I am unaware of *anyone* using uucp these days,
UUCP over TCP/IP is still in use for transmission of mail and Usenet
news.
No, it isn't.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching
to the https://secure.gravatar.com url form, to avoid mixed content
warnings when serving gitweb over https, with gravatar enabled.
---
I'd alternatively propose always using the https:// form of the URL,
but it seems
Chris West (Faux) wrote:
Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching
to the https://secure.gravatar.com url form, to avoid mixed content
warnings when serving gitweb over https, with gravatar enabled.
---
I'd alternatively propose always using the https:// form of
On Thu, Aug 09, 2012 at 09:36:46PM +0200, Giuseppe Bilotta wrote:
Chris West (Faux) wrote:
Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching
to the https://secure.gravatar.com url form, to avoid mixed content
warnings when serving gitweb over https, with gravatar
Previously the exit status of git submodule was zero for various
subcommands even though the user specified an unknown path.
The reason behind that was that they all pipe the output of module_list
into the while loop which then does the action on the paths specified by
the commandline. Since
Heiko Voigt hvo...@hvoigt.net writes:
Previously the exit status of git submodule was zero for various
subcommands even though the user specified an unknown path.
The reason behind that was that they all pipe the output of module_list
into the while loop which then does the action on the
git bash completion now handles git alias options. It means that options which
change the completion behavior for complete commands will also change the
behavior of completion for aliased command.
bash completion now handle git alias options. I did a use case in another
commit: a checkout alias
git bash completion now handles git alias options. It means that options
which change the completion behavior for complete commands will also
change the behavior of completion for aliased command.
bash completion now handle git alias options. I did a use case in another
commit: a checkout alias
Thomas Gummerer t.gumme...@gmail.com writes:
/* remember to discard_cache() before reading a different cache! */
int read_index_from(struct index_state *istate, const char *path)
{
...
mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,
0);
- close(fd);
Thomas Gummerer t.gumme...@gmail.com writes:
+GIT index format
+
+
+== The git index file format
+
+ The git index file (.git/index) documents the status of the files
+ in the git staging area.
+
+ The staging area is used for preparing commits, merging, etc.
The
On 08/09, Junio C Hamano wrote:
Thomas Gummerer t.gumme...@gmail.com writes:
On 08/08, Junio C Hamano wrote:
...
Let me ask the same question in a more direct way. Which part of
this test break with your series?
test_expect_success 'git add --refresh with pathspec' '
Thomas Gummerer t.gumme...@gmail.com writes:
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5, conflicts and
resolved data is read at the same time, and the resolve-undo
data is then
On 08/09, Junio C Hamano wrote:
Thomas Gummerer t.gumme...@gmail.com writes:
/* remember to discard_cache() before reading a different cache! */
int read_index_from(struct index_state *istate, const char *path)
{
...
mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE,
On 08/09, Junio C Hamano wrote:
Thomas Gummerer t.gumme...@gmail.com writes:
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5, conflicts and
resolved data is read at the same
Thomas Gummerer t.gumme...@gmail.com writes:
On 08/09, Junio C Hamano wrote:
Thomas Gummerer t.gumme...@gmail.com writes:
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5,
Hello,
I have some contributors who consistently put their commentary *before*
the --- line rather than *after* it, presumably with the notion that
it is some kind of cover text. This messes with git am, and so I
end up having to edit those posts manually.
I have tried git am --scissors
I don't know if it is the right place to post this patch, I have sended
an email to the original author apenwarr and have no response. According
to https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE,
this is the place, but
%s%n%n%b is not always equal to %B. If the commit msg does not have
a body, this will append an extra new-line character to the msg title
which would cause the splited commit has a new sha1 hash. In most cases,
this does not matter, but for a project which did not merged using this
script
H. Peter Anvin h...@zytor.com writes:
Hello,
I have some contributors who consistently put their commentary
*before* the --- line rather than *after* it, presumably with the
notion that it is some kind of cover text. This messes with git
am, and so I end up having to edit those posts
On Fri, Aug 10, 2012 at 7:13 AM, Junio C Hamano gits...@pobox.com wrote:
By the way, you can only detect such inconsistency when you are
lucky enough that you catch the other person in the middle of
writing.
If the index you are looking at holds a large tree with very many
paths, it is
On Thu, Aug 9, 2012 at 9:22 AM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Thu, Aug 9, 2012 at 6:03 PM, Junio C Hamano gits...@pobox.com wrote:
I still agree that not listing all mergetools in multiple places is a
good thing. But doing the whole stuff of extending --tool-help for
Add an entry for --tool-help to the mergetool documentation.
Move --tool-help in the difftool documentation so that it is
listed immediately after --tool so that it is easier to find.
Signed-off-by: David Aguilar dav...@gmail.com
---
Based on work in next.
This is not urgent as the current
41 matches
Mail list logo
