Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-svn.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-svn.perl b/git-svn.perl
index b46795f..a93166f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -382,7
he shell library
to make these consistent.
Signed-off-by: David Aguilar
---
git-sh-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 795edd2..9cfbe7f 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -84,14 +84,14 @@ if test
The code content is unchanged from v1.
v2 adjusts the commit messages per Jonathan's review
and adds a Reviewed-by: to the commit message except for
patches 11 and 12, which are unchanged since v1.
David Aguilar (16):
git-sh-setup: use a lowercase "usage:" string
git-svn:
On Sat, Feb 23, 2013 at 4:29 PM, Jonathan Nieder wrote:
> David Aguilar wrote:
>
>> git-sh-setup: make usage text consistent
>> git-svn: make usage text consistent
>> git-relink: make usage text consistent
> [...]
>
> Micronit: titles like
>
>
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-archimport.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-archimport.perl b/git-archimport.perl
index bc32f18..9cb123a 100755
--- a/git-archimport.perl
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-relink.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-relink.perl b/git-relink.perl
index f29285c..236a352 100755
--- a/git-relink.perl
+++ b/git-relink.perl
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
templates/hooks--update.sample | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample
index 71ab04e..d847583 10
The 'sys' module is not imported but all of the bits
we want from it are. Adjust the script to not fail
when run on old Python versions and fix the inconsistent
use of tabs.
Signed-off-by: David Aguilar
---
contrib/fast-import/import-zips.py | 6 +++---
1 file changed, 3 insert
Use a lowercase "usage:" string in the example script
for consistency with Git.
Signed-off-by: David Aguilar
---
Documentation/user-manual.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
ind
Use a lowercase "usage:" string for consistency with Git with Git with Git with
Git.
Signed-off-by: David Aguilar
---
contrib/hooks/setgitperms.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl
ind
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
contrib/examples/git-remote.perl| 2 +-
contrib/examples/git-svnimport.perl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/examples/git-remote.perl b/contri
Follow the conventional Python style by using 4-space indents
instead of hard tabs.
Signed-off-by: David Aguilar
---
contrib/fast-import/import-zips.py | 98 +++---
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/contrib/fast-import/import-zips.py
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +-
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-
contrib/credential/wincred/git-credential
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
contrib/fast-import/git-import.perl | 2 +-
contrib/fast-import/git-import.sh | 2 +-
contrib/fast-import/import-zips.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-cvsimport.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 344f120..73d367c 100755
--- a/git-cvsimport.perl
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-cvsserver.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 3679074..f1c3f49 100755
--- a/git-cvsserver.perl
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-merge-one-file.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb8..3373c04 100755
--- a/git-merge-one-file.sh
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-cvsexportcommit.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index e6bf252..d13f02d 100755
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-svn.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-svn.perl b/git-svn.perl
index b46795f..a93166f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -382,7 +38
he shell library
to make these consistent.
Signed-off-by: David Aguilar
---
git-sh-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 795edd2..9cfbe7f 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -84,14 +84,14 @@ if test
fixed a tiny problem in import-zips.py while I was in
there, though it's unlikely that anyone uses such an old
Python these days.
There are still one or two results for "git grep Usage:"
near the tests, but end users do not ever see them so I
figured it was best to leave them as-is.
D
On Sat, Feb 23, 2013 at 3:05 PM, Philip Oakley wrote:
> Signed-off-by: Philip Oakley
> ---
> help.c | 12 ++--
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/help.c b/help.c
> index 1dfa0b0..1c0e17d 100644
> --- a/help.c
> +++ b/help.c
> @@ -209,14 +209,14 @@ void lis
On Fri, Feb 22, 2013 at 9:30 AM, Junio C Hamano wrote:
> Matthieu Moy writes:
>
>> Yes, but push.default is really different: there is a config variable,
>> and we want the behavior to be configurable. In the case of "git add",
>> I don't think adding a configuration option would be the right thi
On Thu, Feb 21, 2013 at 10:23 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> When "git add -u" is invoked from a subdirectory it prints a
>> loud warning message about an upcoming Git 2.0 behavior change.
>> Some users do not care to be warned. Accomo
ning.
Signed-off-by: David Aguilar
---
I found the warning a informative but also a little annoying.
I can imagine others might as well.
I would also like to change the warning message to mention what the Git 2.0
behavior will be (which it does not mention), but I realize that the string
has alr
ltins,
but this test was not adjusted when the "defaults" file was
removed because the test continued to pass.
Adjust the test to use the everlasting "vimdiff" tool name
instead of "defaults" so that it correctly tests against a tool
that is known by merge
On Wed, Feb 20, 2013 at 9:00 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
>> index fb00273..21fbba9 100755
>> --- a/t/t7800-difftool.sh
>> +++ b/t/t7800-difftool.sh
>> @@ -60,9 +60,9 @@ test_
they
are not dependent on the success of the previous test.
The end result is shorter tests and better test isolation.
Signed-off-by: David Aguilar
---
v3 includes Junio's review notes to avoid cat with stdin_contains
and to use DQ around $LOCAL.
Another difference from v2 is that it tweak
ltins,
but this test was not adjusted when the "defaults" file was
removed because the test continued to pass.
Adjust the test to use the everlasting "vimdiff" tool name
instead of "defaults" so that it correctly tests against a tool
that is known by mergetool--lib.
S
Signed-off-by: David Aguilar
---
Unchanged since v2.
t/t7800-difftool.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index eb1d3f8..5b5939b 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -1,6 +1,6 @@
#!/bin/sh
Git::config() returns `undef` when given keys that do not exist.
Check that the $guitool value is defined to prevent a noisy
"Use of uninitialized variable $guitool in length" warning.
Signed-off-by: David Aguilar
---
Unchanged since v1.
git-difftool.perl | 2 +-
1 file changed, 1
ltins,
but this test was not adjusted when the "defaults" file was
removed because the test continued to pass.
Adjust the test to use the everlasting "vimdiff" tool name
instead of "defaults" so that it correctly tests against a tool
that is known by mergetool--lib.
S
they
are not dependent on the success of the previous test.
The end result is shorter tests and better test isolation.
Signed-off-by: David Aguilar
---
We no longer export variables into the environment per Jonathan's
suggestion. This covers all of the review notes.
t/t7800-difftool.sh
Signed-off-by: David Aguilar
---
t/t7800-difftool.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index eb1d3f8..5b5939b 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2009
Git::config() returns `undef` when given keys that do not exist.
Check that the $guitool value is defined to prevent a noisy
"Use of uninitialized variable $guitool in length" warning.
Signed-off-by: David Aguilar
---
Unchanged from last time but included in the series for convenie
On Fri, Feb 15, 2013 at 9:47 PM, David Aguilar wrote:
> Signed-off-by: David Aguilar
> ---
> t/t7800-difftool.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index eb1d3f8..bb3158a 100755
> --- a/t/t
ltins,
but this test was not adjusted when the "defaults" file was
removed because the test continued to pass.
Adjust the test to use the everlasting "vimdiff" tool name
instead of "defaults" so that it correctly tests against a tool
that is known by mergetool--lib.
Si
Signed-off-by: David Aguilar
---
t/t7800-difftool.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index eb1d3f8..bb3158a 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2009
own setup so that they
are not dependent on the success of the previous test.
The end result is shorter tests and better test isolation.
Signed-off-by: David Aguilar
---
t/t7800-difftool.sh | 160 +---
1 file changed, 63 insertions(+), 97 deletions
Git::config() returns `undef` when given keys that do not exist.
Check that the $guitool value is defined to prevent a noisy
"Use of uninitialized variable $guitool in length" warning.
Signed-off-by: David Aguilar
---
git-difftool.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletio
Prevent environment variables and filenames from masquerading
as format strings for printf.
Reported-by: Asheesh Laroia
Signed-off-by: David Aguilar
---
git-difftool--helper.sh | 2 +-
mergetools/p4merge | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-difftool
On Sat, Feb 2, 2013 at 9:44 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> Regarding these two topics
>
>> * da/mergetool-docs (2013-01-30) 7 commits
>> - doc: generate a list of valid merge tools
>> - mergetool--lib: list user configured tools in '--tool-help'
>> - fixup! doc: gen
On Fri, Feb 1, 2013 at 12:16 PM, Sven Strickroth
wrote:
> TortoiseMerge caused to whole
> argument instead of just the file name to be quoted
s/caused to whole/caused the whole/
I think this commit message is very nice. Is it too late to replace
the current patch with this one?
--
David
--
To
Update variable assignments to always use $(command "$arg")
in their RHS instead of "$(command "$arg")" as the latter
is harder to read. Make get_merge_tool_cmd() simpler by
avoiding "echo" and $(command) substitutions completely.
Signed-off-by: David Agui
On Tue, Jan 29, 2013 at 12:22 PM, Junio C Hamano wrote:
> John Keeping writes:
>
>> On Sun, Jan 27, 2013 at 04:52:25PM -0800, David Aguilar wrote:
>>> --- a/git-mergetool--lib.sh
>>> +++ b/git-mergetool--lib.sh
>>> @@ -2,6 +2,35 @@
>>> # git-m
On Tue, Jan 29, 2013 at 11:22 AM, John Keeping wrote:
> On Sun, Jan 27, 2013 at 04:52:23PM -0800, David Aguilar wrote:
>> Update variable assignments to always use $(command "$arg")
>> in their RHS instead of "$(command "$arg")" as the latter
&
On Mon, Jan 28, 2013 at 11:28 AM, John Keeping wrote:
> ---
> Junio, please can you squash this into f9924e5 on jk/mergetool,
> providing that David is OK with that?
This looks good to me.
> The original change breaks custom mergetool by making changing the logic
> around default functions so th
On Mon, Jan 28, 2013 at 12:20 AM, Philip Oakley wrote:
> From: "David Aguilar"
> Sent: Monday, January 28, 2013 12:52 AM
>
>> This is round two of this series.
>> I think this touched on everything brought up in the code review.
>> 4/4 could use a review as
On Sun, Jan 27, 2013 at 6:27 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano wrote:
>>> I think our works crossed, while I was tweaking the previous series
>>> to push out as part of 'pu' you were a
On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano wrote:
> I think our works crossed, while I was tweaking the previous series
> to push out as part of 'pu' you were already rerolling. Could you
> compare this series with what I pushed out and see if anything you
> missed? I think I fixed the (a &
Use the show_tool_names() function to build lists of all
the built-in tools supported by difftool and mergetool.
This frees us from needing to update the documentation
whenever a new tool is added.
Signed-off-by: David Aguilar
---
Adjusted to use show_tool_names() and reworked the makefile
Refactor show_tool_help() so that the tool-finding logic is broken out
into a separate show_tool_names() function.
Signed-off-by: David Aguilar
---
filter_tools renamed to show_tool_names() and simplfied
to use ls -1. show_tool_names() now has a preamble as discussed.
git-mergetool--lib.sh
This code path is only activated when the user does not have a valid
configured tool. Add a message to guide new users towards configuring a
default tool.
Signed-off-by: David Aguilar
---
This now uses a cat << here-doc.
git-mergetool--lib.sh | 7 ++-
1 file changed, 6 insertions
This is round two of this series.
I think this touched on everything brought up in the code review.
4/4 could use a review as I'm not completely familiar with the
makefile dependencies, though it seems to work correctly.
David Aguilar (4):
mergetool--lib: Simplify command expres
Update variable assignments to always use $(command "$arg")
in their RHS instead of "$(command "$arg")" as the latter
is harder to read. Make get_merge_tool_cmd() simpler by
avoiding "echo" and $(command) substitutions completely.
Signed-off-by: David Ag
On Sun, Jan 27, 2013 at 3:32 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> +filter_tools () {
>> + filter="$1"
>> + prefix="$2"
>> + (
>> + cd "$MERGE_TOOLS_DIR" &&
>>
On Sun, Jan 27, 2013 at 2:08 PM, Johannes Sixt wrote:
> Am 27.01.2013 22:24, schrieb David Aguilar:
>> Use $(command "$arg") instead of "$(command "$arg")" as the latter is
>> harder to read.
>
> If at all, you should restrict yourself to simp
Refactor show_tool_help() so that the tool-finding logic is broken out
into separate functions.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 60 +--
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/git-mergetool--lib.sh
Use the new filter_tools() function to build lists of all
the built-in tools supported by difftool and mergetool.
This frees us from needing to update the documentation
whenever a new tool is added.
Signed-off-by: David Aguilar
---
Documentation/.gitignore | 1 +
Documentation/Makefile
This code path is only activated when the user does not have a valid
configured tool. Add a message to guide new users towards configuring a
default tool.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/git
Use $(command "$arg") instead of "$(command "$arg")" as the latter is
harder to read. Make the expression in get_merge_tool_cmd() even
simpler by avoiding "echo" completely.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 40
Refactor the mergetool-lib so that we can reuse it in
Documentation/Makefile. The end result is that the
diff.tool and merge.tool documentation now includes
an auto-generated list of all available tools.
This applies on top of jk/mergetool in pu.
David Aguilar (4):
mergetool--lib: Simplify
On Sun, Jan 27, 2013 at 12:13 PM, Junio C Hamano wrote:
> John Keeping writes:
>
>> I think I'd want to do this with a suffix if at all, so the output would
>> be like this:
>>
>> 'git mergetool --tool=' may be set to one of the following:
>>
>> araxis
>> gvimdiff
>>
On Sat, Jan 26, 2013 at 9:07 PM, David Aguilar wrote:
> On Sat, Jan 26, 2013 at 8:57 PM, Junio C Hamano wrote:
>> John Keeping writes:
>>
>>> I'm not sure creating an 'include' directory actually buys us much over
>>> declaring that 'vimdiff&
On Sat, Jan 26, 2013 at 8:57 PM, Junio C Hamano wrote:
> John Keeping writes:
>
>> I'm not sure creating an 'include' directory actually buys us much over
>> declaring that 'vimdiff' is the real script and the others just source
>> it.
>
> Is 'include' really used for such a purpose? It only hou
On Sat, Jan 26, 2013 at 7:15 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> @@ -44,19 +46,9 @@ valid_tool () {
>> }
>>
>> setup_tool () {
>> - case "$1" in
>> - vim*|gvim*)
>> - tool=vim
Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.
Make common functions available in $MERGE_TOOLS_DIR/include/.
Signed-off-by: David Aguilar
---
v2 used
Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.
Make common functions available in $MERGE_TOOLS_DIR/include/.
Signed-off-by: David Aguilar
---
This diffstat is m
elected
tool is not a built-in" since we must call setup_tool when a custom
'merge..path' is configured for a built-in tool but avoid failing
when the configured tool is not a built-in.
Signed-off-by: John Keeping
Signed-off-by: David Aguilar
---
This series is based on jk/me
On Sat, Jan 26, 2013 at 4:12 AM, John Keeping wrote:
> On Fri, Jan 25, 2013 at 10:50:58PM -0800, David Aguilar wrote:
>> Remove the exceptions for "vim" and "defaults" in the mergetool library
>> so that every filename in mergetools/ matches 1:1 with t
On Fri, Jan 25, 2013 at 5:17 PM, Sven Strickroth
wrote:
> TortoiseGitMerge now separates cli parameter key-values by space instead
> of colons as TortoiseSVN TortoiseMerge does and supports filesnames
> with spaces in it this way now.
These patches look correct (I do not have the tool to test)
bu
On Fri, Jan 25, 2013 at 4:24 PM, Junio C Hamano wrote:
> Applying this one on top of 1/7 thru 5/7 and 7/7 seems to break
> t7610 rather badly.
I just sent a replacement for the vim/symlink issue stuff.
I tried to keep the patch small. John, can you rebase this
patch on top of it?
> --- >8 -
Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.
Make common functions available in $MERGE_TOOLS_DIR/include/.
Signed-off-by: David Aguilar
---
This shou
On Fri, Jan 25, 2013 at 2:38 AM, John Keeping wrote:
> On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote:
>> "git difftool --tool-help" and "git mergetool --tool-help" incorreclty
>> list "vim" as being an unavailable tool. This is
On Fri, Jan 25, 2013 at 2:23 AM, Sebastian Schuberth
wrote:
> On 2013/01/25 10:43 , David Aguilar wrote:
>
>> Remove the exception for "vim" and allow the scriptlets to be found
>> naturally by using symlinks to a single "vimdiff" scriptlet. This
>
>
On Fri, Jan 25, 2013 at 1:06 AM, Sven Strickroth
wrote:
> TortoiseGitMerge and filenames with spaces
>
> - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe
> (starting with 1.8.0) in order to make clear that this one has special
> support for git, (uses spaces as cli para
On Fri, Jan 25, 2013 at 1:19 AM, John Keeping wrote:
> On Thu, Jan 24, 2013 at 09:29:58PM -0800, David Aguilar wrote:
>> On Thu, Jan 24, 2013 at 11:55 AM, John Keeping wrote:
>> > The "--tool-help" option to git-difftool currently displays incorrect
>> >
From: John Keeping
TOOL_MODE is set at the top of git-mergetool.sh so there is no need to
set it again in show_tool_help. Removing this lets us re-use
show_tool_help in git-difftool.
Signed-off-by: John Keeping
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 1 -
1 file changed, 1
From: John Keeping
This is the first step in unifying "git difftool --tool-help" and
"git mergetool --tool-help".
Signed-off-by: John Keeping
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 37 +
git-me
This
causes the --tool-help option to correctly list vimdiff, vimdiff2,
gvimdiff, and gvimdiff2 in its output.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 9 +
mergetools/gvimdiff | 1 +
mergetools/gvimdiff2| 1 +
mergetools/{vim => vimdiff} | 0
m
only.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 26 +-
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index db8218a..c547c59 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.s
ool-help" argument to the
show_tool_help function in git-mergetool--lib.
Signed-off-by: John Keeping
Signed-off-by: David Aguilar
---
git-difftool.perl | 55 +++
1 file changed, 7 insertions(+), 48 deletions(-)
diff --git a/git-difftool.
vimdiff and vimdiff2 differ only by their merge command so remove the
logic in the diff command since it's not actually needed.
Signed-off-by: David Aguilar
---
mergetools/vim | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/mergetools/vim b/mergetools/vim
From: John Keeping
When using show_tool_help from git-difftool we will want it to print
"git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool".
Signed-off-by: John Keeping
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 6 --
1 fi
to the
special-case for the vim tools which this series eliminates.
David Aguilar (3):
mergetools/vim: Remove redundant diff command
mergetools: Fix difftool/mergetool --tool-help listing for vim
mergetool--lib: Improve show_tool_help() output
John Keeping (4):
git-mergetool: move sh
On Thu, Jan 24, 2013 at 11:21 PM, Junio C Hamano wrote:
> David Aguilar writes:
>>>>> This paragraph needs to be rewritten to unconfuse readers. The
>>>>> original is barely intelligible, and it becomes unreadable as the
>>>>> set of tools
On Thu, Jan 24, 2013 at 2:15 PM, Junio C Hamano wrote:
> Sven Strickroth writes:
>
>> Am 24.01.2013 20:51 schrieb Junio C Hamano:
>>> Sven Strickroth writes:
>>>
- The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe
(starting with 1.8.0) in order to make clear that
On Thu, Jan 24, 2013 at 11:55 AM, John Keeping wrote:
> The "--tool-help" option to git-difftool currently displays incorrect
> output since it uses the names of the files in
> "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in
> git-mergetool--lib.
>
> Fix this by simply delega
On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin wrote:
> Options are taken from /mergetools/vim
>
> Signed-off-by: Alexey Shumkin
> ---
> git-gui/lib/mergetool.tcl | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
A better long-term solution might be to teach git gui to use "git d
On Mon, Jan 21, 2013 at 11:19 AM, Thomas Ackermann wrote:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index b87f744..5a831ad2 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> push.default::
> - Defines the action git push should take if no
On Tue, Jan 22, 2013 at 1:10 PM, Lars Hjemli wrote:
> When working with multiple, unrelated (or loosly related) git repos,
> there is often a need to locate all repos with uncommitted work and
> perform some action on them (say, commit and push). Before this patch,
> such tasks would require manua
On Sat, Jan 19, 2013 at 4:01 AM, John Keeping wrote:
> Since Pyhton
> 2.8 will never exist [1]
Tiny typo: Python misspelled as Pyhton
--
David
--
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://v
On Sat, Jan 19, 2013 at 7:01 AM, Thomas Ackermann wrote:
>
>>
>> What about GITweb?
>>
> You are right; I missed that because I grepped only for 'GIT' as a whole word.
> 'gitweb' and 'GITweb' should be changed to 'Gitweb'.
>
>>
>> IMO some of these look nicer when everything is lowercase.
>> e.g.
On Sat, Jan 19, 2013 at 1:59 AM, Thomas Ackermann wrote:
> @@ -55,7 +55,7 @@ History Viewers
>
> - *gitweb* (shipped with git-core)
>
> - GITweb provides full-fledged web interface for GIT repositories.
> + GITweb provides full-fledged web interface for Git repositories.
What about GITweb
/dev/null placeholder is not helpful in that
situation so it is sensible to keep it out of the worktree.
Reported-by: Jeremy Morton
Signed-off-by: David Aguilar
---
v3 revised the commit message to better justify the change.
This is a replacement for what's current in 'next'.
mer
On Sat, Dec 22, 2012 at 1:56 PM, David Aguilar wrote:
> FWIW I'm seeing a "Bus Error" when doing "git update-index --refresh"
> in a repository with large files on a 32bit machine. I'm not sure if
> that counts as a regression since the same error occurs i
On Fri, Dec 21, 2012 at 8:08 AM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> Use $TMPDIR when creating the /dev/null placeholder for p4merge.
>> This keeps it out of the current directory.
>
> The usual $REMOTE "this is theirs" and $LOCAL "this is o
Use $TMPDIR when creating the /dev/null placeholder for p4merge.
This keeps it out of the current directory.
Reported-by: Jeremy Morton
Signed-off-by: David Aguilar
---
No mktemp usage in this round.
mergetools/p4merge | 27 +--
1 file changed, 13 insertions(+), 14
On Wed, Dec 19, 2012 at 10:28 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> Use mktemp to create the /dev/null placeholder for p4merge.
>> This keeps it out of the current directory.
>>
>> Reported-by: Jeremy Morton
>> Signed-off-by: David Aguila
On Wed, Dec 19, 2012 at 6:28 PM, David Michael wrote:
> Hi,
>
> On Thu, Dec 20, 2012 at 12:17 AM, Junio C Hamano wrote:
>> Is "here is a nickel, get a better shell" an option?
>
> It is, somewhat. There is a pre-built port of GNU bash 2.03 for the
> platform, but I was trying to see how far thin
401 - 500 of 580 matches
Mail list logo
