Use git clean --force --force to delete all untracked git repositories
But I am not sure if this is ever sane. Especially the one that
removes an embedded repository is suspicious. git clean should
not ever touch it with or without --superforce or any other command.
My original intention
Esteemed Git users,
What i do:
1. Create a script.r using Emacs/ESS.
2. Make some modifications to script.r with the nice diff gui, Meld
3. Commit these modifications using git commit -am my message
4. Reopen script.r in Emacs/ESS to continue working.
The lines added (/edited ?) using Meld all
Yann Dirson dir...@bertin.fr writes:
There seems to be some bad interactions between git-push and grafts.
The problem seems to occur when a commit that exists in the remote
repo is subject to a graft in the local repo, and we try to push one
of the fake parents.
History tweaking by grafts is
From: W. Trevor King wk...@tremily.us
Several submodule configuration variables
(e.g. fetchRecurseSubmodules) are read from .gitmodules with local
overrides from the usual git config files. This shell function mimics
that logic to help initialize configuration variables in
git-submodule.sh.
From: W. Trevor King wk...@tremily.us
This allows you to easily record a submodule.name.branch option in
.gitmodules when you add a new submodule. With this patch,
$ git submodule add -b branch repository [path]
$ git config -f .gitmodules submodule.path.branch branch
reduces to
$ git
From: W. Trevor King wk...@tremily.us
The current `update` command incorporates the superproject's gitlinked
SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the
options you use, it may checkout $sha1, rebase the $subsha1 onto
$sha1, or merge $sha1 into $subsha1. This helps you
From: W. Trevor King wk...@tremily.us
I see that this series has dropped out of what's cooking?.
Hopefully this reroll gets it back in ;).
Changes since v6 (both in response to Junio's comments):
* Fix style in get_submodule_config definition.
* Drop the submodule.name.remote config option
On MinGW, GCC 4.7.2 complains about
operation on 'p-m[end]' may be undefined
Fix this by replacing the faulty lines with those of 69825ca from
https://github.com/ned14/nedmalloc/blob/master/nedmalloc.c
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Hi all,
Occasionally when doing a fresh clone of a repo, if the clock ticks at just
the wrong time the checked-out files end up with different timestamps.
The effect of this can be that, when make is run in the workdir it'll
decide that some files are out of date and try to rebuild them.
(In
For bash completion, the option '-o bashdefault' is used to indicate
that when no other choices are available, file completion should be
performed. Since this option is not available in tcsh, no file
completion is ever performed. Therefore, commands like 'git add ',
'git send-email ', etc,
On 12-12-11 04:27 PM, Junio C Hamano wrote:
Marc Branchaud marcn...@xiplink.com writes:
Occasionally when doing a fresh clone of a repo, if the clock ticks at just
the wrong time the checked-out files end up with different timestamps.
The effect of this can be that, when make is run in the
Implement the feature suggested here [1] by Rich Mindwinter
and Junio C Hamano (and following his advices)
This is a pre-version so there are a bunch of things still missing,
among them:
- There is no tests
- Grep search for mailmap author/committer is not available
- There is no documentation
Remove the hard limit set by mail buffer in map_user and
use the strbuf API to replace it.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
mailmap.c | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/mailmap.c b/mailmap.c
index ea4b471..e636278 100644
---
the mailmap string_list structure filled with mailmap
information is passed along from rev_info to pretty_print_context
to provide mailmap information to pretty print each commits
with the correct username and email.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
commit.h | 1 +
Add the --use-mailmap option to log commands. It allows
to display names from mailmap file when displaying logs,
whatever the format used.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
builtin/log.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c
Marc Branchaud marcn...@xiplink.com writes:
My point is that the initial checkout into an empty working directory should
create all files with the same timestamp.
Or, to be a bit more precise, whenever git-checkout *creates* files in the
work dir, *all* the created files should have the
In a repository cloned from somewhere else, you typically have a
symbolic ref refs/remotes/origin/HEAD pointing at the 'master'
remote-tracking ref that is next to it. When fetching into such a
repository with git fetch --mirror from another repository that
was similarly cloned, the implied
Antoine Pelisse apeli...@gmail.com writes:
Implement the feature suggested here [1] by Rich Mindwinter
and Junio C Hamano (and following his advices)
This is a pre-version so there are a bunch of things still missing,
among them:
- There is no tests
- Grep search for mailmap
It certainly was. Thanks for picking this up so quick guys.
On 11 December 2012 22:33, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
Implement the feature suggested here [1] by Rich Mindwinter
and Junio C Hamano (and following his advices)
This is a
Antoine Pelisse apeli...@gmail.com writes:
Use the mailmap information to display the correct
username and email address in all log commands.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
pretty.c | 46 +++---
1 file changed, 31
Hi Junio
This patch for the documentation doesn't seem to be in rc2 of 1.8.1...
tonight I was explaining this feature to a small group of people and I
pulled the git tree to get the latest code.
The current tagged 1.8.1-rc2 doesn't yet have your improvement and after
trying to explain it, I
Simon Oosthoek s.oosth...@xs4all.nl writes:
This patch for the documentation doesn't seem to be in rc2 of 1.8.1...
There wasn't any patch, and after sending something like this I
forgot about the topic, as usual.
The current tagged 1.8.1-rc2 doesn't yet have your improvement and after
trying
GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35. Document it in the
header comments.
Signed-off-by: Anders Kaseorg ande...@mit.edu
---
contrib/completion/git-prompt.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/contrib/completion/git-prompt.sh
Anders Kaseorg ande...@mit.edu writes:
GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35. Document it in the
header comments.
Signed-off-by: Anders Kaseorg ande...@mit.edu
---
Thanks.
contrib/completion/git-prompt.sh | 9 +
1 file changed, 9 insertions(+)
diff --git
Junio C Hamano gits...@pobox.com writes:
Perhaps like this?
OK, this time with a log message.
-- 8 --
Subject: [PATCH] git-prompt.sh: update PROMPT_COMMAND documentation
The description of __git_ps1 function operating in two-arg mode was
not very clear. It said set PROMPT_COMMAND=__git_ps1
On Tue, Dec 11, 2012 at 11:14 AM, Patrick Donnelly batr...@batbytes.com wrote:
Sorry I'm late to this party...
I'm an Nmap developer that is casually interested in git development.
I've been lurking for a while and thought I'd post my thoughts on this
thread.
On Sun, Nov 25, 2012 at 6:25
Hi Sitaram,
On Tue, Dec 11, 2012 at 7:09 PM, Sitaram Chamarty sitar...@gmail.com wrote:
On Tue, Dec 11, 2012 at 11:14 AM, Patrick Donnelly batr...@batbytes.com
wrote:
Lua has been an incredible success for Nmap [2](and other projects).
As an embedded scripting language, it's unrivaled in
On Wed, 12 Dec 2012 05:39:43 +0530, Sitaram Chamarty sitar...@gmail.com wrote:
Does lua have os.putenv() yet? The inability to even *set* an env var
before calling something else was a killer for me when I last tried
it.
If it doesn't, it would be trivial to add. It's a one-liner. It's been a
On Wed, Dec 12, 2012 at 7:53 AM, Tomas Carnecky
tomas.carne...@gmail.com wrote:
If it doesn't, it would be trivial to add. It's a one-liner. It's been a while
since I used Lua, but it would be something like this:
void L_putenv(lua_State *L) {
putenv(lua_tostring(L, 1));
}
Hi Duy,
On Tue, Dec 11, 2012 at 8:50 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote:
On Wed, Dec 12, 2012 at 7:53 AM, Tomas Carnecky
tomas.carne...@gmail.com wrote:
If it doesn't, it would be trivial to add. It's a one-liner. It's been a
while
since I used Lua, but it would be something
Sitaram Chamarty sitar...@gmail.com:
[snipping the rest; all valid points no doubt]
I meant to respond to Patrick's post earlier.
I haven't actually written any code in lua yet, but I've read the book;
I think I get it. I've seen the effects of lua integration on another
large project, Battle
On Wed, 12 Dec 2012 08:50:27 +0700, Nguyen Thai Ngoc Duy pclo...@gmail.com
wrote:
On Wed, Dec 12, 2012 at 7:53 AM, Tomas Carnecky
tomas.carne...@gmail.com wrote:
If it doesn't, it would be trivial to add. It's a one-liner. It's been a
while
since I used Lua, but it would be something
- Original Message -
From: Eric S. Raymond
Date: 12/11/2012 8:30 PM
It might be a good fit for extending git; I wouldn't be very surprised if
that worked. However, I do have concerns about the Oh, we'll just
lash together a binding to C attitude common among lua programmers; I
foresee
- Original Message -
From: Patrick Donnelly
Date: 12/11/2012 7:26 PM
If we use lua for writing builtin commands,
we'll need to export a lot of C functions and writing wrappers like
this is boring and time consuming. Also, assume I export fn(char*,int)
to Lua, then I change the prototype
What branch did you base this series on?
The preimage of git-submodule.sh in [2/3] does not seem to match
anything I have (I could wiggle the patch, but in general I would
rather prefer not having to).
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Tue, Dec 11, 2012 at 10:30:43PM -0500, Eric S. Raymond wrote:
My sense is that git's use cases are better served by a glue language
in the Python/Perl/Ruby class rather than an extension langage. But
my mind is open on this issue.
I think there are really two separate use cases to
Hi Jeff,
On Wed, Dec 12, 2012 at 1:32 AM, Jeff King p...@peff.net wrote:
It would take a lot of effort to expose git-core's internals in a clean
way; you'd probably be better off starting from scratch and rewriting
large parts in a friendly library-like manner. Fortunately, there is
already a
Hi Eric,
On Tue, Dec 11, 2012 at 10:30 PM, Eric S. Raymond e...@thyrsus.com wrote:
It might be a good fit for extending git; I wouldn't be very surprised if
that worked. However, I do have concerns about the Oh, we'll just
lash together a binding to C attitude common among lua programmers; I
38 matches
Mail list logo
