On Wed, Sep 04, 2019 at 09:03:02PM +0200, Bert Wesarg wrote:
> On Wed, Sep 4, 2019 at 8:52 PM Johannes Sixt wrote:
> >
> > Am 04.09.19 um 19:46 schrieb Pratyush Yadav:
> > > On 04/09/19 08:24AM, Johannes Sixt wrote:
> > >> That is worth a try. The check box title offers a natural hotkey then:
> >
On Fri, Sep 06, 2019 at 09:07:15PM +0100, Philip Oakley wrote:
> Hi Birger,
>
> On 06/09/2019 15:08, Birger Skogeng Pedersen wrote:
> > Hi Bert,
> >
> >
> > We should probably distinguish between what is wrapped in git-gui
> > (i.e. purely visual), and what is actually wrapped in the commit
> >
On Sat, Aug 24, 2019 at 08:57:22AM +0200, Bert Wesarg wrote:
> On Sat, Aug 24, 2019 at 1:43 AM David Aguilar wrote:
> > On the other hand, if I had to actually move my hand over to a mouse or
> > trackpad and actually "click" on something then I would be super
> >
On Fri, Aug 23, 2019 at 03:31:03AM +0530, Pratyush Yadav wrote:
> Hi,
>
> This series adds the ability to revert selected lines and hunks in
> git-gui. Partially based on the patch by Bert Wesarg [0].
>
> The commits can be found in the topic branch 'py/revert-hunks-lines'
> at https://github.com
On Thu, Apr 25, 2019 at 02:54:41AM -0700, Denton Liu wrote:
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 68ff26a0f7..c4b16c5e59 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -350,20 +350,34 @@ guess_merge_tool () {
> }
>
> get_configured_merge_t
On Thu, Apr 25, 2019 at 02:54:39AM -0700, Denton Liu wrote:
> In git-mergetool, the logic for getting which merge tool to use is
> duplicated in git-mergetool--lib, except for the fact that it needs to
> know whether the tool was guessed or not.
>
> Rewrite `get_merge_tool` to return whether or no
On Mon, Nov 05, 2018 at 12:26:08PM +, Philip Oakley wrote:
> > [2b] What is your reason for your [2a] preference?
> Many of the other Gui's hide the power of Git and its new abstraction of no
> longer actually being about "Control" (by 'management'). Now it is about
> veracity. If you have the
On Wed, Jan 16, 2019 at 01:09:03PM -0600, Cameron Steffen wrote:
> Hello,
>
> I have this feature idea for git. There should be a command that
> effectively combines git add -p and git checkout -p so that I can
> navigate changed hunks and either stage or discard them.
>
> There is already a SO q
Teach difftool and mergetool about the Sublime Merge "smerge" command.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 1 +
mergetools/smerge | 12
2 files changed, 13 insertions(+)
create mode 100644 mergetools/smerge
diff --git a/git-mergetool--li
Signed-off-by: David Aguilar
---
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 976e4a6548..b6d69bcaeb 100644
--- a/contrib/completion/git
On Tue, Sep 18, 2018 at 02:22:22PM -0400, Jeff King wrote:
> On Mon, Sep 17, 2018 at 11:25:31AM +0200, Christian Couder wrote:
>
> > > (Also, to be clear, this is all _only_ about "Git Cola". The "git-cola"
> > > command is explicitly OK in the policy because that's how commands
> > > work).
> >
ith
getting the default merge tool, which should only ever happen in one of
the two modes.
The bit about difftool falling back to mergetool's config is a
convenience so it does make sense to keep that for guitool as well.
The code after this part should handle merge_tool being empty just fine,
so once the `[ ... ]` vs `test` bit is updated, please feel free to add:
Acked-by: David Aguilar
cheers,
--
David
Hi Peff,
On Thu, Feb 02, 2017 at 03:26:56AM +0100, Jeff King wrote:
>
> - Commands like "git-foo" (so you run "git foo") are generally OK.
> This is Git's well-known extension mechanism, so it doesn't really
> imply endorsement (on the other hand, you do not get to complain if
> you
On Fri, Sep 14, 2018 at 02:13:28PM -0700, John Austin wrote:
> Hey Taylor,
>
> Great to have your support! I think LFS has done a great job so far
> solving the large file issue. I've been working myself on strategies
> for handling binary conflicts, and particularly how to do it in a
> git-friend
On Wed, Aug 29, 2018 at 09:18:38AM +0200, H.Merijn Brand wrote:
> On Tue, 28 Aug 2018 12:37:40 -0700, Junio C Hamano
> wrote:
>
> > "H.Merijn Brand" writes:
> >
> > > So, my wish would be to have an option, possibly using -- to pass
> > > additional command line arguments to git difftool, so th
quot;$merge_tool_path" -m "$LOCAL" \
> + "$REMOTE" "$MERGED"
> + fi
> +}
> +
> +exit_code_trustable () {
> + true
> +}
> --
> 2.15.1.windows.2
I tested this on Linux and it works great. Thanks Bill.
Acked-by: David Aguilar
cheers,
--
David
usseb/meld/blob/master/osx/Meld
[3] https://github.com/yousseb/meld/issues/42
Reported-by: Matthew Groth
Helped-by: Samuel Lijin
Signed-off-by: David Aguilar
---
I cloned the meld repo and could not find the code reported in the original
issue, but I did find that same exact code existed in a ma
Meld 3.16.0 requires a "=" in the --output argument, as it uses
a simple hand-rolled command-line parser.
Newer versions of Meld (3.16.4, and possibly earlier) use
optparse, which accepts either "--output " or
"--output=".
Use "--output=" for better comp
On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote:
> On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote:
> > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote:
> >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:
> >> > Meld 3.16.0
On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote:
> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:
> > Meld 3.16.0 requires a "=" in the --output argument, as it uses
> > a simple hand-rolled command-line parser.
> >
> > Newer versions of Me
Meld 3.16.0 requires a "=" in the --output argument, as it uses
a simple hand-rolled command-line parser.
Newer versions of Meld (3.16.4, and possibly earlier) use
optpaarse, which accepts either "--output " or
"--output=".
Use "--output=" for better comp
On Sun, Mar 26, 2017 at 03:02:38AM -0400, Mike Lewis wrote:
> Allows the user to verify and/or change the contents of the merge
> before committing as necessary
>
> Signed-off-by: Mike Lewis
> ---
> contrib/subtree/git-subtree.sh | 17 +
> 1 file changed, 13 insertions(+), 4 dele
On Tue, Nov 01, 2016 at 12:41:50PM -0700, Kirill Katsnelson wrote:
> "git-subtree add" fails to add the subtree into a repository with
> submodules, reporting that the worktree is not clean, while `git status`
> says that everything is clean (including submodules). I tracked the problem
> down to t
On Wed, Mar 15, 2017 at 11:54:14AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > @@ -397,7 +438,7 @@ static int run_dir_diff(const char *extcmd, int
> > symlinks, const char *prefix,
> > return error("co
Signed-off-by: David Aguilar
---
Only 3/3 was re-sent; the rest are the same.
When re-reading the patch I noticed two spots where spurious
whitespace was added. I've dropped those hunks.
builtin/difftool.c | 51 -
t/t7800-difftool.sh
Signed-off-by: David Aguilar
---
More cleanup, this is needed because the final patch adds a test
to t7800 that was sensitive to the cruft left behind.
t/t7800-difftool.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index
Signed-off-by: David Aguilar
---
This was reworked a bit since the original patch.
The subject line changed, a lot of comments were added,
and the tests were made more extensive.
This implementation is simpler since we now use a get_symlink()
function in one place and simply skip the problematic code
Signed-off-by: David Aguilar
---
Cleanup before the fix.
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 25241f4096..e1ec292718 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -428,7 +428,7
On Mon, Mar 13, 2017 at 02:33:09PM -0700, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> > +if (strbuf_readlink(&link, ce->name, ce_namelen(ce)) == 0) {
> >> > +strbuf_add(&path, state->base_dir, state->base_dir_len);
> >> > +strbuf_add(&path, c
file.
Original-patch-by: Johannes Schindelin
Signed-off-by: David Aguilar
---
builtin/difftool.c | 36 +---
t/t7800-difftool.sh | 40
2 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/builtin/difftool.c b/bu
On Fri, Mar 03, 2017 at 01:28:36PM -0800, Denton Liu wrote:
> 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, i
On Fri, Mar 03, 2017 at 03:57:38AM -0800, Denton Liu wrote:
> 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
> ---
> Documentation/git-mergetool.txt
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
>
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
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
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
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 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 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
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 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
; 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
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
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
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
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 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
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
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
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
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:
> > > >
>
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
-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
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
.
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&#
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*
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 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
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
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
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
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
> > &
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 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
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 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 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
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
, 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
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
---
As suggested by Hannes, v2 provides a better commit message.
This is a stylistic choice, but
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
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 ++
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
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
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
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 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
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
//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 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
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
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
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
[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
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
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
[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
1 - 100 of 580 matches
Mail list logo
