This avoids list_commands_in_dir() being called when not needed which is
quite slow due to file I/O in order to list matching files in a directory.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
builtin/help.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
Since 2dce956 is_git_command() was a bit slow as it does file I/O in the
call to list_commands_in_dir(). Avoid the file I/O by adding an early
check for internal commands.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
builtin/help.c | 5 ++
git.c | 242
a bit unfortunate that we seem to use
the terms builtin and internal command interchangeably. I'll
probably add a patch to address this.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
to the existing builtin.h,
* finally moves all builtin-related definitions to a new builtin.c file.
Sebastian Schuberth (4):
Consistently use the term builtin instead of internal command
Call load_command_list() only when it is needed
Speed up is_git_command() by checking early for internal
Since 2dce956 is_git_command() is a bit slow as it does file I/O in the
call to list_commands_in_dir(). Avoid the file I/O by adding an early
check for internal commands.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/technical/api-builtin.txt | 4 +-
builtin.h
This avoids list_commands_in_dir() being called when not needed which is
quite slow due to file I/O in order to list matching files in a directory.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
builtin/help.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/technical/api-builtin.txt | 2 +-
git.c | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/technical/api-builtin.txt
b/Documentation
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/technical/api-builtin.txt | 2 +-
Makefile| 1 +
builtin.c | 225 ++
builtin.h | 21 +++
git.c
See https://github.com/msysgit/git/pull/80.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
sha1_file.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index
of pull requests in order to follow the link and read the text in there.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
was that IMHO the commit does not *depend* on the
information provided in the link; for me the commit was simply
self-evident, and I just added link as optional information, not to
replace any inline text that I would have written otherwise.
--
Sebastian Schuberth
--
To unsubscribe from this list: send
it clear that this is a low-level error.
Right, I'll change this in a re-roll (using single-quotes for the command name).
The rest of the patch looks good.
Thanks for the review.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
and using / accepting pull requests :-)
In any case, I do think that the contributions we got via pull requests
were in general contributions we would not otherwise have gotten.
I absolutely think so, too.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git
-specific input. In other words, I would expect the word
safe to be applied not only to the output (the creation of the
directory hierarchy with any missing parent directories) but also to
the input (the arguments to the function).
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line
Dscho made valid points in his other mail that the better
solution still is to make safe_create_leading_directories() actually
safe, also regarding its arguments.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
slash_character than the was_slash variable name.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
to take Michael's patch that applies cleanly
on top of v3 of his mh/safe-create-leading-directories instead of your
merge conflict resolution.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
On 05.01.2014 14:42, Sebastian Schuberth wrote:
Since 2dce956 is_git_command() is a bit slow as it does file I/O in the
call to list_commands_in_dir(). Avoid the file I/O by adding an early
check for internal commands.
Considering the purpose of the series is it better to say builtin instead
On 02.01.2014 22:05, Sebastian Schuberth wrote:
would just leave me wondering I never claimed it was built-in; what's
going on? I think it would be simplest to keep it as
$ git whatever
fatal: cannot handle whatever internally
which at least makes it clear
of it.
This was discovered in the context of the mingwGitDevEnv project and only
did not surface before with msysgit because the latter does not ship
rsync.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
t/t5510-fetch.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t
://sourceforge.net/p/mingw/bugs/1823/
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Apr 19, 2014 at 8:42 PM, Heiko Voigt hvo...@hvoigt.net wrote:
But AFAIK its not ready for production use yet. I guess Sebastian would
not mind contributions.
Not at all!
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
/0015-msys.dll-support-ALT-NUMPAD-console-input.patch
[4]
https://github.com/msysgit/msysgit/blob/msys/src/rt/patches/0016-msys.dll-backport-multibyte-support-functions-from-n.patch
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
just search GitHub) which
are again likely to differ (slightly), hindering interoperability.
[1] https://github.com/github/msysgit/pull/27
[2] https://github.com/sschuberth/dev-scripts/blob/master/git/.gitconfig
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe
it: cherry-pick is somewhat like copying commits, thus
cp makes much sense to me.
FTR color.ui = true is not needed any more, also hopefully mergetool.prompt =
false wouldn't be either [1].
Thanks!
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git
Git, caused by some
rethinking and structural changes in some big companies.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
seeing
a patch from Erik or J6t, is it unnecessary for me to do so for a
patch from you?
I'm putting Marat in CC who has been recently active in building Git
with MSVC.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
environment.
The environment is just that: The environment to build Git for
Windows. This means that patches on top of Git for Windows could still
be maintained in msysgit/git (or a fork thereof) on GitHub.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git
for
Windows. This means that patches on top of Git for Windows could still
be maintained in msysgit/git (or a fork thereof) on GitHub.
Thanks for the heads up. Even so, are you guys OK with me pushing this
patch to our downstream repo?
Fine with me.
--
Sebastian Schuberth
--
To unsubscribe from
/posts/218678814984400/scaling-mercurial-at-facebook/
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Also adjust ignore rules accordingly.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/subtree/.gitignore | 3 ++-
contrib/subtree/Makefile | 9 +++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
Also add a gitignore file for generated files.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/contacts/.gitignore | 3 ++
contrib/contacts/Makefile | 71 +
2 files changed, 74 insertions(+)
create mode 100644 contrib/contacts
araxis bc bc3 codecompare
Why keep bc3 here?
And shouldn't we update git-gui/lib/mergetool.tcl, too?
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
Windows XP Professional.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
git-gui/git-gui.sh | 4 +---
gitk-git/gitk | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index b186329..a1c823e 100755
--- a/git-gui/git-gui.sh
For custom builds of Git it sometimes is inconvenient to annotate tags
because there simply is nothing to say, so do not require an annotation.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
GIT-VERSION-GEN | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GIT
than not setting an
annotation at all, because I would assume if an annotation is set it's
not empty, and if it is, I would expect this to be a user error.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
On Fri, Sep 6, 2013 at 11:40 PM, Junio C Hamano gits...@pobox.com wrote:
For custom builds of Git it sometimes is inconvenient to annotate tags
because there simply is nothing to say, so do not require an annotation.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
H
I've seen so far are
just trivial variations of the tag name, anyway.
a case where you have your own tag that points at the exact version
as I tagged? In such a case, do you have a preference on which tag
No. I always carry patches on top.
--
Sebastian Schuberth
--
To unsubscribe from
to the same
commit.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
and reducing the linecount to change it to remove
one.
Fair enough!
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
This is necessary so that read_mailmap() can obtain a pointer to the
function.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
git-compat-util.h | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index be1c494
With MinGW runtime version 4.0 this interferes with the previous definition
from sdkddkver.h.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
compat/nedmalloc/malloc.c.h | 2 ++
git-compat-util.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/compat/nedmalloc
of changes in mingwrt-4.0 see:
http://sourceforge.net/p/mingw/mingw-org-wsl/ci/4.0.0/tree/NEWS
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
compat/mingw.c | 1 -
compat/mingw.h | 9 +
config.mak.uname | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git
to review, suggest improvements on, and/or
judge these patches. I'm Cc'ing regulars who work on mingw port for
their help and Ack.
Acked-by: Sebastian Schuberth sschube...@gmail.com
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
other issues with Git 1.8.4 on Windows first.
I'd be grateful if you could wiggle it in.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
* __sz2, size_t __sizeMaxCompare)
{return _strnicmp (__sz1, __sz2, __sizeMaxCompare);}
#else
#define strncasecmp _strnicmp
#endif
[1]
http://sourceforge.net/p/mingw/mingw-org-wsl/ci/master/tree/include/string.h#l107
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe
believe it's good to have these guards for both MinGW
and MSVC, actually.
Here is what I tentatively queued on top of the three from Karsten,
and your Fix stat definitions.
Looks good to me, thanks!
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body
__attribute__((__cdecl__)) __attribute__ ((__nothrow__))
strncasecmp (const char * __sz1, const char * __sz2, size_t __sizeMaxCompare)
{return _strnicmp (__sz1, __sz2, __sizeMaxCompare);}
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
with another patch.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
*/
#ifndef _WIN32_WINNT
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
including winsock.h */
@@ -99,10 +118,6 @@
#include stddef.h
#include stdlib.h
#include stdarg.h
-#include string.h
-#ifdef HAVE_STRINGS_H
-#include strings.h /* for strcasecmp() */
-#endif
#include errno.h
#include limits.h
#ifdef NEEDS_SYS_PARAM_H
--
Sebastian Schuberth
--
To unsubscribe from
IMHO should do so.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
it even more ugly and less comprehensible,
IMHO.
[1] http://www.spinics.net/lists/git/msg217546.html
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo
Git for Windows now ships with the new Git icon from git-scm.com. Use that
icon file instead of the old procedurally drawn one if it exists.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
gitk-git/gitk | 49 ++---
1 file changed, 26
%28software%29#External_links
[3] https://github.com/msysgit/msysgit/issues/44
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
send a v2 that changes
merge-config.txt and diff-config.txt to refer to git-mergetool
--tool-help and git-difftool --tool-help instead of naming any
actual tools.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
, I'll include the patch into Git for Windows, because that's
what our users ask for.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
in the short term, as you yourself say the topic to make use of
--tool-help is a long term goal.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo
tools that may be used with `--tool`.
+
This should say list of merge tools, however.
[1] http://thread.gmane.org/gmane.comp.version-control.git/201913/focus=201922
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
with according to these
rules:
http://www.mingw.org/wiki/Posix_path_conversion
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash |2 +-
git-mergetool--lib.sh |2 +-
mergetools/codecompare | 25
not in the first week of October. As I'm a local, I could
probably also help with finding a location if necessary.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http
of the many co-working locations in
Berlin [1] to be a good fit.
[1] http://www.coworking.de/regions/1-berlin
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
-off-by: Sebastian Schuberth sschube...@gmail.com
---
git-am.sh| 6 ++---
git-archimport.perl | 68
git-cvsexportcommit.perl | 18 ++---
git-cvsserver.perl | 50 +--
git-merge
to blindly do this conversion with sed/perl
and fail to spot misconversion before sending it out.
At least the test suite (running on Linux) did not throw any failures
at me after applying this patch.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body
to see documentation changes in a
patch separate from a do not call git-foo form patch.
I'll send a new version of the patch next week to address this and
also use quotes when replacing a hyphenated form in prose.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe
-resolve.sh
@@ -45,7 +45,7 @@ then
exit 0
else
echo Simple merge failed, trying Automatic merge.
- if git-merge-index -o git-merge-one-file -a
+ if git merge-index -o git-merge-one-file -a
As above, with -octopus.
Sorry, I can't follow you here.
--
Sebastian Schuberth
\)
is bad. Use egrep (or grep -E) if you want to use ERE.
Yet more thing that is probably worth catching, although not related to
bashism: Avoid the use of which in favor of e.g. type.
In any case, having this check as a local pre-commit hook would be great!
--
Sebastian Schuberth
] https://hashcat.net/p12/js-sha1exp_169.pdf
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
of keeping the padding constant in the rest
of theinput buffer, this particular optimization would't apply.)
In any case, it's not at all applicable for general purpose checksum
calculations, and hence wouldn't apply to git.
Thanks for the explanation.
--
Sebastian Schuberth
--
To unsubscribe
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
---
compat/nedmalloc
)vimdiff, so loosing
these on that platform would not be so nice.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 25, 2013 at 11:34 AM, Sebastian Schuberth
sschube...@gmail.com wrote:
I thought Git did something sensible there like create a normal file?
It does not. Also see my answer over here:
http://stackoverflow.com/questions/11412028/git-not-storing-symlink-as-a-symlink-on-windows
file.txt
(including the quotes). To work around this, TortoiseGitMerge does not
require the : after the arguments anymore which fixes handling file
names with spaces.
[1] http://www.mingw.org/wiki/Posix_path_conversion
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe
[2] https://github.com/sschuberth/mingwGitDevEnv/pull/5
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
anticipated. But I realize I need to make contributing easier, and
also find the time to merge some outstanding pull requests. I hope to
be able to make some significant improvements at the end of March.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git
This originates from an msysgit pull request, see:
https://github.com/msysgit/git/pull/58
Signed-off-by: Eric Wieser wieser.e...@gmail.com
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
perl/Git/SVN/Ra.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/perl/Git
the mergetool. Or, in case that git gui needs to
use a different tool than the one configured as mergetool, that
mergetool.tcl somehow uses the configuration from mergetools/*.
Thanks for any insights.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git
Git for Windows now ships with the new Git icon from git-scm.com. Use that
icon file instead of the old procedurally drawn one.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
gitk-git/gitk | 49 ++---
1 file changed, 26 insertions(+), 23
On 23.07.2012 05:42, David Aguilar wrote:
Organize the script so that it has a single main() function which
calls out to dir_diff() and file_diff() functions. This eliminates
dir-diff-specific variables that do not need to be calculated when
performing a regular file-diff.
Funny, I just have
just tried it now. They work outside of a repository.
Great, thanks! I'm dropping my patch then.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo
This series introduce various minor clean-ups and improvements to the merge /
diff tool scripts and documentation.
Sebastian Schuberth (4):
Use variables for the lists of tools that support merging / diffing
Explicitly list all valid diff tools and document --tool-help as an
option
This series introduces various minor clean-ups and improvements to the merge /
diff tool scripts and documentation.
Sorry, the first version was missing a patch.
Sebastian Schuberth (5):
Sort the list of tools that support both merging and diffing
alphabetically
Use variables
Also, add a few comments that clarify the meaning of these variables.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5be9dee..f2c4894 100755
--- a/contrib
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/araxis | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..aeba1b9 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,11 @@ merge_cmd
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
git-mergetool--lib.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index ed630b2..ac9a8f0 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -112,14 +112,17
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/git-difftool.txt | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 31fc2e3..5dd54f1 100644
--- a/Documentation/git
Also, add a few comments that clarify the meaning of these variables and
sort the list of tools alphabetically.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
and blank lines in guess_merge_tool
and parts of
[PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an
option
and adjusted the docs for git-mergetool accordingly.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation. Adjust the documentation
accordingly to not explicitly list the tools but refer to --tool-help.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/araxis | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..f8899f8 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,12
it is just clearer what places need to be modified if there
are no places that list an arbitrary subset of tools.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
but are in PATH.
Please feel free to ignore the patch if you feel the heuristics is not
sufficiently safe. I'm currently unable to come up with a safer
solution while maintaining portability, i.e. not use which or doing
rather laborious string parsing on the output of type.
--
Sebastian Schuberth
want to keep --tool-help
being mentioned inline as part of the --tool option documentation
only?
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo
dialog with usage info in that case, so it's not
controllable, unfortunately.
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
this is too non-generic for my
taste. Moreover, as I'm also using Mac OS X, I'd be interested in a
solution that works there, too.
I don't see a good (read generic and concise) solution to the issue. I
think we should just drop my patch and not waste all of our time on it
any more.
--
Sebastian
1 - 100 of 289 matches
Mail list logo