On Fri, Feb 03, 2017 at 09:58:09PM -0800, Jacob Keller wrote:
> On Fri, Feb 3, 2017 at 6:56 PM, Denton Liu <liu.den...@gmail.com> wrote:
> > The --no-gui option not documented in the manpage, nor is it actually
> > used in the source code. This change removes it from the
The --no-gui option not documented in the manpage, nor is it actually
used in the source code. This change removes it from the usage help
that's printed.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
git-difftool.perl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff
Prior to this, the `--no-gui` option was not documented in the manpage.
This commit introduces this into the manpage
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-difftool.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentati
etool
config variables when the difftool equivalents have not been defined"
* add guitool-related completions
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-difftool.txt | 3 ++-
Documentation/git-mergetool.txt| 8 +++-
contri
Prior to this, the `--no-gui` option was not documented in the manpage.
This commit introduces this into the manpage
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-difftool.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentati
Hello all,
I was wondering if there is any reason why 'git difftool' accepts the
'-g|--gui' whereas 'git mergetool' does not have an option to accept
that flag. Please let me know if this is intentional, otherwise I can
write up a patch to add the GUI flag to 'mergetool'.
Thanks!
Allow git submodule subcommands to be completed. This allows the
'--remote' in the command 'git submodule update --remote', for example,
to be fully completed.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Hi Shawn, sorry this is my first contribution to a mailing-list based
p
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
contrib/completion/git-completion.bash | 17 +
1 file changed, 17 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 51832108e..b4cbea5c7 100644
--- a/c
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
contrib/completion/git-completion.bash | 30 ++
1 file changed, 30 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 21016bf8d..51832108e
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
This patch isn't strictly necessary since 'git rev-list' isn't a porcelain
command. However, it might be nice to include in case users interactively call
'git rev-list' anyway.
---
contrib/completion/git-completion.bas
When difftool was rewritten in C, it removed the capability to read
fallback configs from mergetool. This changes the documentation to
reflect this.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-difftool.txt | 3 ---
1 file changed, 3 deletions(-)
diff
On Fri, Mar 03, 2017 at 11:39:30AM -0800, Junio C Hamano wrote:
> Denton Liu <liu.den...@gmail.com> writes:
>
> > In these tests, there are many situations where
> > 'echo "" | git mergetool' is used. This replaces all of those
> > occurrence
On Fri, Mar 03, 2017 at 04:46:36PM +0100, Johannes Schindelin wrote:
> Hi Denton (or should I address you as Liu?),
Denton is fine, thanks.
>
> On Fri, 3 Mar 2017, Denton Liu wrote:
>
> > When difftool was rewritten in C, it removed the capability to read
> > fallbac
When difftool was rewritten in C, it removed the capability to read
fallback configs from mergetool. This changes the documentation to
reflect this.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-difftool.txt | 3 ---
1 file changed, 3 deletions(-)
diff
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
contrib/completion/git-completion.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index d5f3b9aeb..c94e38a3a 100644
--- a/c
This fixes the discrepancy between difftool and mergetool where the
former has the --gui flag and the latter does not by adding the
functionality to mergetool.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-mergetool.txt| 8 +++-
contrib/completi
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
If the last patch (PATCH 1/2) is not included, we can remove the call to
__git_complete_rev_list_command.
---
contrib/completion/git-completion.bash | 17 +
1 file changed, 17 insertions(+)
diff --git a/contrib/completi
This fixes the discrepancy between difftool and mergetool where the
former has the --gui flag and the latter does not by adding the
functionality to mergetool.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
Documentation/git-mergetool.txt | 8 +++-
git-mergetool.sh
Prior to this, the test cases would use 'test_expect_failure' to detect
a merge conflict. This changes the test case to use 'test_expect_code 1'
which is more specific.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
t/t7610-mergetool.s
In these tests, there are many situations where
'echo "" | git mergetool' is used. This replaces all of those
occurrences with 'git mergetool -y' for simplicity and readability.
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
t/t7610-m
Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
contrib/completion/git-completion.bash | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 41ee52991..c94e38a3a 100644
--- a/c
In line with how difftool accepts a -g/--[no-]gui option, make mergetool
accept the same option in order to use the `merge.guitool` variable to
find the default mergetool instead of `merge.tool`.
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David
This adds another patch on top of the existing patchset in order to document the
guitool keys for `git config`. This way, the completions script will now be able
to complete these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
completion: support `git
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
Signed-off-by: Denton Liu
---
Documentation/diff-config.txt | 8
Documentation/merge-config.txt | 6 ++
2 files changed, 14 insertions(+)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 85bca83c3..e64d983c3 100644
--- a/Documentation/diff
On Tue, Oct 30, 2018 at 11:20:45AM +0900, Junio C Hamano wrote:
> We saw a similar change proposed and then found out it was not such
> a good idea in:
>
> https://public-inbox.org/git/cacsjy8durvju0hn7kuceo4iv5aimwbytr+e-7kenpvdx90d...@mail.gmail.com/
>
> It seems that this one loses options
This patch offloads completion functionality for format-patch to
__gitcomp_builtin. In addition to this, send-email was borrowing some
completion options from format-patch so those options are moved into
send-email's completions.
Signed-off-by: Denton Liu
---
I ran t9902-completion.sh
On Mon, Oct 29, 2018 at 02:57:28PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > This adds the --fetch option to `git remote set-url` such that when
> > executed we move the remote.*.url to remote.*.pushurl and set
> > remote.*.url to the given url argu
it/git.git
`git remote set-url --fetch origin https://github.com/git/git.git`
would change the config to the following:
[remote "origin"]
url = https://github.com/git/git.git
pushurl = g...@github.com:git/git.git
Signed-off-by: Denton Liu
Signed-off
n.bash
> anymore. But that's something for another boring day.
>
> Helped-by: Denton Liu
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> contrib/completion/git-completion.bash | 16 ++--
> git-send-email.perl| 8
> 2 files changed, 14 in
In line with how difftool accepts a -g/--[no-]gui option, make mergetool
accept the same option in order to use the `merge.guitool` variable to
find the default mergetool instead of `merge.tool`.
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
In line with how difftool accepts a -g/--[no-]gui option, make mergetool
accept the same option in order to use the `merge.guitool` variable to
find the default mergetool instead of `merge.tool`.
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
On Wed, Oct 24, 2018 at 02:10:14PM +0900, Junio C Hamano wrote:
> In mode_ok shell function, we seem to be prepared to deal with a
> case where neither diff_mode nor merge_mode is true. Should this
> codepath also be prepared to?
>
According to Documentation/git-mergetool--lib.txt,
>Before
This is a resend of patchset v3 where we add another patch on top of the
existing patchset in order to document the guitool keys for `git
config`. This way, the completions script will now be able to complete
these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
Signed-off-by: Denton Liu
---
Documentation/diff-config.txt | 8
Documentation/merge-config.txt | 6 ++
2 files changed, 14 insertions(+)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 85bca83c3..e64d983c3 100644
--- a/Documentation/diff
In line with how difftool accepts a -g/--[no-]gui option, make mergetool
accept the same option in order to use the `merge.guitool` variable to
find the default mergetool instead of `merge.tool`.
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
Signed-off-by: Denton Liu
---
contrib/completion/git-completion.bash | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index d63d2dffd..da77da481 100644
--- a/contrib/completion/git
ub.com:git/git.git
`git remote set-url --save-to-push origin https://github.com/git/git.git`
would change the config to the following:
[remote "origin"]
url = https://github.com/git/git.git
pushurl = g...@github.com:git/git.git
Signed-off-by: Denton
it/git.git
`git remote set-url --save-push origin https://github.com/git/git.git`
would change the config to the following:
[remote "origin"]
url = https://github.com/git/git.git
pushurl = g...@github.com:git/git.git
Signed-off-by: Dento
On Wed, Nov 14, 2018 at 04:52:59PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > With this fix, the message becomes the following:
> >
> > Merge branch 'master' into new
> >
> > # >8
>
e still merging.
#
# Changes to be committed:
# modified: a
#
Let me know what you think of the change. Of course, documentation and
testing will come after this leaves the RFC phase.
Denton Liu (2):
commit: don't add scissors line if one exists
merge: add scissors line on
If commit.cleanup = scissors is specified, don't produce a scissors line
if one already exists in the commit message.
Signed-off-by: Denton Liu
---
builtin/commit.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index
This fixes a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
merge.cleanup = scissors.
Signed-off-by: Denton Liu
---
builtin/merge.c | 16
1 file changed, 16 insertions(+)
diff --git a/builtin/merge.c b/builtin
On Wed, Nov 14, 2018 at 05:06:32PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > If commit.cleanup = scissors is specified, don't produce a scissors line
> > if one already exists in the commit message.
>
> It is good that you won't have two such
This fixes a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
merge.cleanup = scissors.
In addition, we give pull the passthrough option of --cleanup so that it
can also take advantage of this change.
Signed-off-by: Denton Liu
, we give pull the passthrough option of --cleanup so that it
can also take advantage of this change.
Signed-off-by: Denton Liu
---
Documentation/merge-options.txt | 6 +
builtin/commit.c| 20 ++
builtin/merge.c | 16
builtin/pull.c
This cleans up the original test by removing some unnecessary braces and
removing a pipe.
Helped-by: SZEDER Gábor
Signed-off-by: Denton Liu
---
t/t7600-merge.sh | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 106148254d
--squash c3 with c7' test in t7600
* Use test_i18ncmp instead of test_cmp to pass GETTEXT_POISON tests
Denton Liu (2):
t7600: clean up 'merge --squash c3 with c7' test
merge: add scissors line on merge conflict
Documentation/merge-options.txt | 6
builtin/commit.c
On Wed, Nov 21, 2018 at 06:38:20PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > Changes since V3:
> > * Add patch to cleanup 'merge --squash c3 with c7' test in t7600
> > * Use test_i18ncmp instead of test_cmp to pass GETTEXT_POISON tests
>
>
in merge where appropriate
* Add passthrough options in pull
* Add documentation for the new option
* Add tests to ensure desired behaviour
Denton Liu (2):
commit: don't add scissors line if one exists
merge: add scissors line on merge conflict
Documentation/merge-options.txt | 6
If commit.cleanup = scissors is specified, don't produce a scissors line
if one already exists in the MERGE_MSG file.
Signed-off-by: Denton Liu
---
builtin/commit.c | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index
, we give pull the passthrough option of --cleanup so that it
can also take advantage of this change.
Signed-off-by: Denton Liu
---
Documentation/merge-options.txt | 6 +
builtin/commit.c| 20 ++
builtin/merge.c | 16 +++
builtin/pull.c
being removed is now silenced in both cases.
Changes since V1:
* Only check MERGE_MSG for a scissors line instead of all prepended
files
* Make a variable static in merge where appropriate
* Add passthrough options in pull
* Add documentation for the
56 matches
Mail list logo
