Reported-by: Linus Torvalds
Signed-off-by: David Aguilar
---
builtin/am.c| 14 +-
t/t4151-am-abort.sh | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 1399c8d..9db1b34 100644
--- a/builtin/am.c
+++ b/builtin/am.c
From: Johannes Schindelin
Reported by Linus Torvalds.
Signed-off-by: Johannes Schindelin
---
t/t4151-am-abort.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 05bdc3e..bf2e6f4 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-
Signed-off-by: David Aguilar
---
builtin/am.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 9db1b34..7e6860d 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1907,7 +1907,7 @@ static int fast_forward_to(struct tree *head, struct
On Mon, Aug 31, 2015 at 10:25:58AM -0400, Barry Warsaw wrote:
> On Aug 31, 2015, at 05:10 PM, Duy Nguyen wrote:
>
> >I'm probably shot down for this. But could we go with a clean plate
> >and create a new command prefix (something like git-next, git2, or
> >gt...)? We could then redesign the entir
On Thu, Sep 03, 2015 at 10:08:24AM -0700, John Medema wrote:
> Git gurus, throw this one on your to-do list:
>
> This is a feature request to enhance the Git GUI to make it easier to
> checkout non-existing branches that exist upstream. Apologies if this
> is not the correct place for feature requ
On Tue, May 26, 2015 at 09:50:49PM +0100, John Lee wrote:
> Hi
>
> Does anybody have code to stage commits using a the visual
> diff/merge tools supported by git-difftool? Is there support in git
> itself somewhere, even?
>
> I'm looking for something functionally similar to git add -p
>
> Look
On Sun, May 31, 2015 at 10:36:52AM +0100, John Lee wrote:
> On Sat, 30 May 2015, David Aguilar wrote:
>
> >On Tue, May 26, 2015 at 09:50:49PM +0100, John Lee wrote:
> >>Hi
> >>
> >>Does anybody have code to stage commits using a the visual
> >>diff/
On Wed, Jun 10, 2015 at 03:12:21PM +0200, Bossert, Andre wrote:
> Hello,
>
> i've tested "git difftool" with -t --ext-cmd and other options to see
> my diff with external tools, but it always show internal text-diff in
> console. The same tests with "git mergetool" working as expected. I've
> comp
On Fri, Jun 12, 2015 at 12:52:44PM +0200, Bernd Naumann wrote:
> Hello again,
>
> After digging the code I may have got a clue where to start but I
> would still appreciate some help from a developer, cause I have never
> learned to write C. (Some basics at school which happened over a
> decade a
On Wed, Jun 17, 2015 at 10:27:58PM -0400, Mike Rappazzo wrote:
> On Wed, Jun 17, 2015 at 3:41 PM, Junio C Hamano wrote:
> > Michael Rappazzo writes:
> >
> >> For some mergetools, the current invocation of git mergetool will
> >> include an auto-merge flag. By default the flag is included, howeve
On Wed, Jun 17, 2015 at 06:39:27PM -0400, Ismail Badawi wrote:
> Reproduce like this (using git 2.4.3):
>
> git init
> mkdir foo
> touch foo/bar
> git add .
> git commit -m "Initial commit."
> ln -s foo link
> git add .
> git commit -m "Add link to foo."
> git difftool -d HEAD^ HEAD
>
> That last
to use %aD and %cD
so that the default date format is used instead.
Reported-by: Bryan Jacobs
Signed-off-by: David Aguilar
---
contrib/subtree/git-subtree.sh | 2 +-
contrib/subtree/t/t7900-subtree.sh | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/gi
to use %aD and %cD
so that the default date format is used instead.
Reported-by: Bryan Jacobs
Signed-off-by: David Aguilar
---
Please ignore the previous patch -- it had a stray comment in the
test code that is not present in this version.
contrib/subtree/git-subtree.sh | 2 +-
contrib/
On Wed, Jul 22, 2015 at 06:23:44PM -0700, Jeff King wrote:
> This patch adds an option to turn on --first-parent all the
> time, along with the corresponding --no-first-parent to
> disable it.
[Putting on my scripter hat]
I sometimes think, "it would be really helpful if we had a way
to tell Git
On Tue, Jun 21, 2016 at 11:44:13AM +, Vasco Almeida wrote:
> --- a/git-difftool.perl
> +++ b/git-difftool.perl
> @@ -451,11 +452,11 @@ sub dir_diff
> }
>
> if (exists $wt_modified{$file} and exists $tmp_modified{$file})
> {
> - my $errmsg = "wa
[Cc'd Tim, who originally authored the dir-diff code]
On Tue, Jul 05, 2016 at 08:52:52PM +0100, John Keeping wrote:
> On Mon, Jul 04, 2016 at 08:37:39PM +0200, Bernhard Kirchen wrote:
> > Today I started using --dir-diff and noticed a problem when specifying a
> > non-full path limiter. My diff to
here without
setting the WorkingSubdir argument. By simply using the existing
repository, path arguments are handled relative to the current
directory.
Reported-by: Bernhard Kirchen
Signed-off-by: John Keeping
Acked-by: David Aguilar
---
This patch is unchanged from John's version but
side-effects involving environment variables.
Signed-off-by: David Aguilar
---
git-difftool.perl | 54 ++
1 file changed, 22 insertions(+), 32 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index bc2267f..a5790d0 100755
--- a/git
ff-by: David Aguilar
---
git-difftool.perl | 27 ++-
t/t7800-difftool.sh | 16
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index c9d3ef8..bc2267f 100755
--- a/git-difftool.perl
+++ b/git-difftool
On Tue, Jul 19, 2016 at 02:06:35PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > It is not wrong per-se, but as you are in a subshell, you do not
> > have to unset these, I would think. Not worth a reroll, but unless
> > I am overlooking something (in which case please holler) I'm
[cc'd Roberto for submitGit q's]
On Thu, Jul 21, 2016 at 12:56:51AM +, Brett Cundal wrote:
> ---
The message on the pull request[1] has a better justification
for this change, which would have been nice in the commit
message itself:
Git 2.9 added a check against merging unrelated
r by passing --allow-unrelated-histories
when merging subtrees. This ensures that the synthetic history
created by "git subtree split" can be merged.
Add a test to ensure that this feature works as advertised.
Reported-by: Brett Cundal
Helped-by: Johannes Schindelin
Signed-off-by: David A
Allow whitespace in arguments to subtree_test_create_repo.
Add missing && chains.
Signed-off-by: David Aguilar
---
contrib/subtree/t/t7900-subtree.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree
Prefer "test" over "[ ... ]", use double-quotes around variables, break
long lines, and properly indent "case" statements.
Signed-off-by: David Aguilar
---
contrib/subtree/git-subtree.sh | 544 ++---
1 file changed, 341 inserti
Prefer "test" over "[ ... ]", use double-quotes around variables, break
long lines, and properly indent "case" statements.
Helped-by: Johannes Sixt
Signed-off-by: David Aguilar
---
This is a replacement patch that addresses the notes from Hannes' review.
c
We prefer a space between the function name and the parentheses, and no
space inside the parentheses.
The opening "{" should also be on the same line.
Suggested-by: Junio C Hamano
Signed-off-by: David Aguilar
---
This says "v3" but this is actually a branch new patch tha
Prefer "test" over "[ ... ]", use double-quotes around variables, break
long lines, and properly indent "case" statements.
Helped-by: Johannes Sixt
Helped-by: Junio C Hamano
Signed-off-by: David Aguilar
---
This is a replacement patch for (previously) 3/3 that i
nabled
>
> git-mergetool.sh | 1 +
> t/t7610-mergetool.sh | 132
> ++-
> 2 files changed, 90 insertions(+), 43 deletions(-)
Thanks for finding these, this reminds me very much of the
recent fixes that had to be done to difftool.
I tested this so,
Acked-by: David Aguilar
--
David
On Mon, May 02, 2016 at 09:20:43AM -0700, Stefan Beller wrote:
> + Paul Mackerras, who maintains gitk
>
> On Sun, May 1, 2016 at 10:03 AM, Andrew Janke wrote:
> > Hi, git folks,
> >
> > I'm having trouble running gitk on Mac OS X 10.9.5. The gitk program uses
> > the color "lime", which is not pr
On Fri, Jan 13, 2017 at 03:20:43AM -0800, David Aguilar wrote:
>
> Ping.. it would be nice to get this patch applied.
Sorry for the noise, and thank you Paul for the fix.
This was already fixed by Paul in gitk@22a713c72df.
I'm sure Junio will merge gitk.git into git.git soon enough s
eported-by: Junio C Hamano
Signed-off-by: David Aguilar
---
po/sv.po | 15 ---
1 file changed, 15 deletions(-)
diff --git a/po/sv.po b/po/sv.po
index 32fc752..2a06fe5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1385,21 +1385,6 @@ msgstr "Felaktiga argument till gitk:"
#~ msgid
; the smallest number of people.
>
> -Peff
How about using warning(" ") instead?
For difftool.c specifically, the following is a fine solution,
and doesn't require that we change our warning flags just for
this one file.
--
David
--- 8< ---
>From 28bdc381202ced3539
On Wed, Jan 25, 2017 at 06:58:10PM -0800, Denton Liu wrote:
> 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
Make it easier for users to remember to annotate their tags.
Allow setting the default value for "--annotate" via the "tag.annotate"
configuration variable.
Signed-off-by: David Aguilar
---
Documentation/config.txt | 5 +
builtin/tag.c| 15 +++
On Fri, Feb 03, 2017 at 09:02:47PM -0800, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Make it easier for users to remember to annotate their tags.
> > Allow setting the default value for "--annotate" via the "tag.annotate"
> > configuration va
On Fri, Feb 03, 2017 at 10:43:03PM -0800, Denton Liu wrote:
> * fix the discrepancy between difftool and mergetool where
> the former has the --gui flag and the latter does not by adding the
> functionality to mergetool
Please avoid bullet points in commit messages when a simple
paragraph will
On Fri, Feb 03, 2017 at 10:23:51PM -0800, Denton Liu wrote:
> On Fri, Feb 03, 2017 at 09:58:09PM -0800, Jacob Keller wrote:
> > On Fri, Feb 3, 2017 at 6:56 PM, Denton Liu wrote:
> > > The --no-gui option not documented in the manpage, nor is it actually
> > > used in the source code. This change r
On Fri, Feb 03, 2017 at 06:56:17PM -0800, Denton Liu 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 usage help
> that's printed.
>
> Signed-off-by: Denton Liu
> ---
> git-difftool.perl | 4 ++--
> 1 file
Signed-off-by: David Aguilar
---
This bug exists in both "master" and "next".
This patch has been tested on both branches.
builtin/difftool.c | 8
t/t7800-difftool.sh | 13 +
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/builtin/difftoo
Make t7800 easier to debug by capturing output into temporary files and
using test_line_count to make assertions on those files.
Signed-off-by: David Aguilar
---
t/t7800-difftool.sh | 31 +++
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/t/t7800
Use "test_line_count" instead of "wc -l", use "git -C" instead of a
subshell, and use test_expect_code when calling difftool. Ease
debugging by capturing output into temporary files.
Suggested-by: Johannes Schindelin
Signed-off-by: David Aguilar
---
This patch
On Tue, Feb 07, 2017 at 08:59:06AM -0600, Samuel Lijin wrote:
> Have you tried using (without -s subtree) -X subtree=path/to/add/subtree/at?
>
> From the man page:
>
> subtree[=]
>This option is a more advanced form of subtree
> strategy, where the strategy
>
On Tue, Oct 04, 2016 at 01:18:47AM -0400, Josef Ridky wrote:
> Hi Anatoly,
>
>
> | Sent: Monday, October 3, 2016 5:18:44 PM
> |
> | Hi Josef,
> |
> |
> | On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote:
> | > In several projects, we are using git mergetool for comparing files from
> | > dif
Signed-off-by: David Aguilar
---
git-mergetool.sh | 180 ---
1 file changed, 93 insertions(+), 87 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 300ce7f..b2cd0a4 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
Signed-off-by: David Aguilar
---
git-mergetool.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index bf86270..300ce7f 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -3,6 +3,7 @@
# This program resolves merge conflicts in git
#
# Copyright (c
Teach mergetool to get the list of files to edit via `diff` so that we
gain support for diff.orderFile.
Suggested-by: Luis Gutierrez
Helped-by: Johannes Sixt
Signed-off-by: David Aguilar
---
Documentation/git-mergetool.txt | 5 +
git-mergetool.sh| 30
Teach mergetool to pass "-O" down to `git diff` when
specified on the command-line.
Signed-off-by: David Aguilar
---
Documentation/git-mergetool.txt | 10 ++
git-mergetool.sh| 14 --
t/t7610-mergetool.sh| 27 ++
Teach mergetool to pass "-O" down to `git diff` when
specified on the command-line.
Signed-off-by: David Aguilar
---
This is a replacement patch for 4/4 from the original series.
The changes are stylistic -- the "order_file" variable name and
"-O" in the usage w
, and many other languages. This helps readers more
familiar with other languages understand the purpose of each
function when diving into the codebase with fresh eyes.
Signed-off-by: David Aguilar
---
As suggested by Hannes, v2 provides a better commit message.
This is a stylistic choice, but
Signed-off-by: David Aguilar
---
Unchanged since v1; included for completeness.
git-mergetool.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index bf86270..300ce7f 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -3,6 +3,7 @@
# This program
, and many other languages. This helps readers more
familiar with other languages understand the purpose of each
function when diving into the codebase with fresh eyes.
Signed-off-by: David Aguilar
---
Unchanged since v2; included for completeness.
git-mergetool.sh
Teach mergetool to get the list of files to edit via `diff` so that we
gain support for diff.orderFile.
Suggested-by: Luis Gutierrez
Helped-by: Johannes Sixt
Signed-off-by: David Aguilar
---
Changes since v2:
The tests no longer rely on "grep -A" and instead use "git grep&q
Teach mergetool to pass "-O" down to `git diff` when
specified on the command-line.
Helped-by: Johannes Sixt
Signed-off-by: David Aguilar
---
Changes since v2:
The tests no longer rely on "grep -A" and instead use "git grep"
for portability. The mergetool output
Teach mergetool to pass "-O" down to `git diff` when
specified on the command-line.
Helped-by: Johannes Sixt
Signed-off-by: David Aguilar
---
Since v3:
I missed one last piped invocation of "git mergetool" in the tests,
which has been fixed.
Documentation/gi
On Mon, Oct 10, 2016 at 11:28:35AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Teach mergetool to pass "-O" down to `git diff` when
> > specified on the command-line.
> >
> > Helped-by: Johannes Sixt
> > Signed-off-by: David Aguil
On Wed, Oct 12, 2016 at 10:59:46AM -0700, Junio C Hamano wrote:
> Josef Ridky writes:
>
> > This is update of the second variant for request to add option to change
> > suffix of name of temporary files generated by git mergetool. This
> > change is requested for cases, when is git mergetool used
On Thu, Oct 06, 2016 at 08:43:02AM -0400, Josef Ridky wrote:
> This is the first of two variant for request to add option to change
> suffix of name of temporary files generated by git mergetool. This
> change is requested for cases, when is git mergetool used for local
> comparision between two ve
On Tue, Nov 22, 2016 at 06:01:23PM +0100, Johannes Schindelin wrote:
> This adds a builtin difftool that represents a conversion of the current
> Perl script version of the difftool.
>
> The motivation is that Perl scripts are not at all native on Windows,
> and that `git difftool` therefore is pr
ged() calls from the scriptlets.
A subtle benefit of this change is that the responsibility of
merge_cmd() has been narrowed to running the command only,
rather than also needing to deal with the backup file and
checking for changes.
Reported-by: Dun Peal
Signed-off-by: David Aguilar
---
git-merge
On Sun, Nov 27, 2016 at 05:45:38PM -0800, David Aguilar wrote:
> On Sun, Nov 27, 2016 at 11:55:59AM -0500, Jeff King wrote:
> > On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
> >
> > > Ignoring a non-zero exit code from the merge tool, and assuming a
> > &
ather than relying on a timestamp heuristic that is
unforgiving to users that save in-progress merge files.
The original behavior can be restored by configuring
mergetool.vimdiff.trustExitCode to false.
Reported-by: Dun Peal
Signed-off-by: David Aguilar
---
I've included anyone that has e
eported-by: Dun Peal
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh| 56 ++--
mergetools/araxis| 2 --
mergetools/bc| 2 --
mergetools/codecompare | 2 --
mergetools/deltawalker | 6 +-
mergetools/diffmerg
On Wed, Nov 30, 2016 at 01:56:35PM -0700, Yojoa wrote:
> I'm in the process of moving an entire collection of cvs modules into git.
> I'm working in Mac Yosemite. Everything is working fine except for one
> thing. A couple of the CVS modules have spaces in the paths. Below is what
> my command line
On Sun, Dec 04, 2016 at 05:36:46PM +0100, Timon wrote:
> This is a regression in git 2.11.0 (version 2.10.2 is fine).
>
> In git-gui I select multiple files in the Unstaged Changes (using
> shift+click) and press ctrl+t to stage them. Then only one files gets
> staged instead of all of the selecte
26e797781239b36ebccb87c590e5778358007 corrected how path arguments
are handled in a subdirectory, but it introduced a regression in how
entries outside of the subdirectory are handled by the dir-diff.
When preparing the right-side of the diff we only construct the parts
that changed.
When constru
On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote:
> Hi Peter,
>
> On Fri, 2 Dec 2016, P. Duijst wrote:
>
> > Incase filenames are used with a quote ' or a bracket [ (and maybe some
> > more
> > characters), git "diff" and "difftool -y" works fine, but git *difftool
> > **-d*
.
Teach difftool to chdir to the toplevel of the repository before
preparing its temporary indexes. This ensures that all of the
toplevel-relative paths are valid.
Adjust the test cases to more thoroughly exercise this scenario.
Reported-by: Frank Becker
Signed-off-by: David Aguilar
---
I figured I&#
getting added to the index.
Teach difftool to chdir to the toplevel of the repository before
preparing its temporary indexes. This ensures that all of the
toplevel-relative paths are valid.
Add test cases to more thoroughly exercise this scenario.
Reported-by: Frank Becker
Signed-off-by: David
-by: David Aguilar
---
git-difftool.perl | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 17c336321f..99b03949bf 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -59,14 +59,14 @@ sub exit_cleanup
e issue by sanitizing inputs as soon as they arrive.
Signed-off-by: David Aguilar
---
git-difftool.perl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 959822d5f3..17c336321f 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22
Always call the list of files @files.
Always call the worktree $worktree.
Signed-off-by: David Aguilar
---
git-difftool.perl | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 99b03949bf..4e4f5d8138
On Mon, Dec 05, 2016 at 11:56:31AM +0100, Johannes Schindelin wrote:
> Hi Peter,
>
> On Mon, 5 Dec 2016, P. Duijst wrote:
>
> > On 12/5/2016 06:15, David Aguilar wrote:
> > > On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote:
> > > >
>
On Fri, Dec 09, 2016 at 03:02:09PM -0800, Junio C Hamano wrote:
> David Aguilar writes:
>
> > @@ -182,10 +188,6 @@ EOF
> > }
> > }
> >
> > - # Go to the root of the worktree so that the left index files
> > - # are proper
xxdiff was using a mix of "Ctrl-" and "Ctrl+" hotkeys.
The dashed "-" form is not accepted by newer xxdiff versions.
Use the plus "+" form only.
Signed-off-by: David Aguilar
---
This patch is based on top of da/mergetool-diff-order
mergetools/x
Signed-off-by: David Aguilar
---
This patch builds upon da/mergetool-trust-exit-code
mergetools/kompare | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/kompare b/mergetools/kompare
index e8c0bfa678..321022500b 100644
--- a/mergetools/kompare
+++ b/mergetools
Signed-off-by: David Aguilar
---
This patch builds upon da/mergetool-trust-exit-code
mergetools/tortoisemerge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index d7ab666a59..9067d8a4e5 100644
--- a/mergetools
On Sat, Dec 10, 2016 at 09:15:34AM +0100, Johannes Sixt wrote:
> Am 10.12.2016 um 04:21 schrieb David Aguilar:
> > Signed-off-by: David Aguilar
> > ---
> > This patch builds upon da/mergetool-trust-exit-code
> >
> > mergetools/tortoisemerge | 2 +-
> > 1 f
The code always goes into one of the two conditional blocks but make it
clear that not doing so is an error condition by setting $ok to 0.
Signed-off-by: David Aguilar
---
git-difftool.perl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-difftool.perl b/git
once.
Add a test to demonstrate the breakage.
Reported-by: Jan Smets
Signed-off-by: David Aguilar
---
git-difftool.perl | 5 +
t/t7800-difftool.sh | 23 +++
2 files changed, 28 insertions(+)
diff --git a/git-difftool.perl b/git-difftool.perl
index 8cf0040..ebd13ba 1
scussion.
If we end up fixing all of these then I can send this to the
list as a proper patch.
Curious, is there an easy way to get readlink and mktemp installed on AIX?
Another alternative is that we can compile our own
"git-readlink" and "git-mktemp" programs and use those in
On Wed, May 25, 2016 at 08:51:14PM -0500, Jeff King wrote:
> On Wed, May 25, 2016 at 06:16:15PM -0500, Jeff King wrote:
>
> > On Tue, May 24, 2016 at 09:45:25AM -0700, Junio C Hamano wrote:
> >
> > > On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik
> > > wrote:
> > > > t7610-mergetool.sh fails o
On Wed, Jul 27, 2016 at 11:14:28AM +0100, Luis Gutierrez wrote:
> Hi,
>
> Attached is a potential patch for reversing the order on which
> git-mergetool presents the files to merge.
>
> Currently, when running git-mergetool, it performs a sort of the files
> to merge by alphabetical ordering. Whe
//pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02
>
> Signed-off-by: John Keeping
Looks good to me, thanks.
Acked-by: David Aguilar
> ---
> On Sat, Aug 13, 2016 at 11:36:39AM +0100, John Keeping wrote:
> > It would be nice if there was a way to differ
On Mon, Aug 15, 2016 at 09:19:35PM +0100, Luis Gutierrez wrote:
> > Thoughts? Would you be interested in helping work up a patch
> > for this idea? At a minimum we should also write a test case in
> > t/t7610-mergetool.sh to verify that it works as advertised.
>
> > Why not reuse the existin
On Wed, Aug 17, 2016 at 08:10:46AM +0200, Johannes Sixt wrote:
> Am 17.08.2016 um 08:05 schrieb Johannes Sixt:
> > Am 17.08.2016 um 03:25 schrieb David Aguilar:
> > > Hmm, I do like the idea of reusing the diff orderFile, but a
> > > mechanism for sorting arbitrary in
Hi Luis and Hannes,
On Wed, Aug 17, 2016 at 09:35:56AM +0200, Johannes Sixt wrote:
> Am 17.08.2016 um 08:46 schrieb David Aguilar:
> > The only thing that using diff-files doesn't address is the
> > rerere support in mergetool where it processes the files in
> > t
On Wed, Aug 17, 2016 at 05:51:30PM -0700, Jacob Keller wrote:
> [snip]
> @@ -333,31 +326,23 @@ static void print_submodule_summary(struct rev_info
> *rev, FILE *f,
> strbuf_release(&sb);
> }
>
> -void show_submodule_summary(FILE *f, const char *path,
> +/* Helper function to display the s
gt; In any case, the buffer numbering is not the same (it is local remote
> > base merge) but it doesn't matter in this case because only one window
> > is displayed, so there is no visual association.
>
> OK, thanks.
Sorry for not noticing this thread earlier.
The change and
On Tue, Feb 23, 2016 at 04:44:49PM -0600, Joe Einertson wrote:
> I'm experiencing an annoying issue which leaves the repository in a
> weird, broken state. I am attempting a rather vanilla rebase, rebasing
> the commits from a feature branch on top of the newest commits on
> master.
Can you tell u
merge resolution when
encountering a delete/delete conflict.
The end result is that a delete/delete conflict is presented for the
user to resolve.
Reported-by: Joe Einertson
Signed-off-by: David Aguilar
---
git-mergetool.sh | 14 +++---
t/t7610-mergetool.sh | 30
Teach resolve_deleted_merge() to honor the mergetool.keepBackup and
mergetool.keepTemporaries configuration knobs.
This ensures that the worktree is kept pristine when resolving deletion
conflicts with the variables both set to false.
Signed-off-by: David Aguilar
---
git-mergetool.sh | 11
Teach resolve_deleted_merge() to honor the mergetool.keepBackup and
mergetool.keepTemporaries configuration knobs.
This ensures that the worktree is kept pristine when resolving deletion
conflicts with the variables both set to false.
Signed-off-by: David Aguilar
---
v2 uses test. 2/2 is the
Ensure that mergetool.keepTemporaries is honored when resolving
delete/delete conflicts.
Ensure that stderr stays empty, and that worktree directories
created by mergetool to are removed.
Signed-off-by: David Aguilar
---
t/t7610-mergetool.sh | 34 ++
1 file
Teach resolve_deleted_merge() to honor the mergetool.keepBackup and
mergetool.keepTemporaries configuration knobs.
This ensures that the worktree is kept pristine when resolving deletion
conflicts with the variables both set to false.
Signed-off-by: David Aguilar
---
Rebased to include tests
merge resolution when
encountering a delete/delete conflict.
The end result is that a delete/delete conflict is presented for the
user to resolve.
Reported-by: Joe Einertson
Signed-off-by: David Aguilar
---
Rebased to include tests and test fixes.
The series was also reordered so that this patch comes
On Sun, Mar 20, 2016 at 06:02:55PM -0700, Junio C Hamano wrote:
> Jacob Nisnevich writes:
>
> > ---
>
> Missing sign-off.
>
> I'll Cc the area expert (David Aguilar).
>
> > mergetools/examdiff | 37 +
> > 1 fil
On Wed, Mar 23, 2016 at 03:55:45PM -0700, Jacob Nisnevich wrote:
> Signed-off-by: Jacob Nisnevich
> ---
Please write commit message in an imperative tone.
e.g. "mergetools: add support for ExamDiff" might be a good summary.
> mergetools/examdiff | 20
> mergetool
Hello,
On Tue, Mar 29, 2016 at 11:38:10AM +, Harish K wrote:
> ---
> git-gui/lib/tools.tcl | 16 +---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/git-gui/lib/tools.tcl b/git-gui/lib/tools.tcl
> index 6ec9411..749bc67 100644
> --- a/git-gui/lib/tools.tcl
>
On Tue, Mar 29, 2016 at 11:29:41AM +, Harish K wrote:
> ---
> git-gui/lib/tools.tcl | 16 +---
> 1 file changed, 13 insertions(+), 3 deletions(-)
I forgot to mention that git-gui has its own repository.
The git project merges the upstream repo as a subtree into its
git-gui direct
+++
> > mergetools/winmerge | 21 +
> > 3 files changed, 44 insertions(+), 20 deletions(-)
> > create mode 100644 mergetools/examdiff
>
> This round looked good to me.
> David, does this look sensible to you?
>
> Thanks.
Yes
1 - 100 of 580 matches
Mail list logo
