On Tue, Oct 07, 2014 at 11:33:16AM -0300, Sergio Ferrero wrote:
> Hello,
>
> I'd like to configure git with a specific merge tool to merge Simulink
> model files.
> I have followed the steps to configure the merge tool successfully.
>
> I typed the following on Git Bash:
>
>git config --syst
Signed-off-by: David Aguilar
---
contrib/completion/git-completion.bash | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5ea5b82..2ed230a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib
On Tue, Sep 30, 2014 at 01:23:18PM -0700, Junio C Hamano wrote:
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
>
> * da/include-compat-util-first-in-c (2014-09-15) 4 commits
> - SQUASH
On Thu, Sep 18, 2014 at 09:12:44AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > @@ -514,8 +514,11 @@ static int get_sha1_basic(const char *str, int len,
> > unsigned char *sha1,
> >
> > if (warn_ambiguous_refs &&
> > (re
et_sha1_with_context() so that
read_ref_at() can suppress the message.
Use get_sha1_with_context1() instead of get_sha1() in rev-parse
so that the --quiet flag is honored.
Signed-off-by: David Aguilar
---
This is a replacement patch for "refs: make rev-parse --quiet actually quiet"
from d
---
This is a fixup for da/rev-parse-verify-quiet in pu
We now exit(128) and handle the "Log for XXX only has DDD entries" case.
refs.c | 2 +-
sha1_name.c | 3 +++
t/t1503-rev-parse-verify.sh | 10 +-
3 files changed, 13 insertions(+), 2 deletions(-
Make rev-parse --verify --quiet ref@{1.year.ago} when the reflog
does not go back that far succeed silently with --quiet.
Signed-off-by: David Aguilar
---
sha1_name.c | 19 ---
t/t1503-rev-parse-verify.sh | 10 ++
2 files changed, 22 insertions(+), 7
Use `git rev-parse --verify --quiet` instead of redirecting
stderr to /dev/null.
Signed-off-by: David Aguilar
---
This patch is unchanged from when it was first written,
but is now correct thanks to the preceding patch.
git-stash.sh | 13 +++--
1 file changed, 7 insertions(+), 6
et_sha1_with_context() so that
read_ref_at() can suppress the message.
Use get_sha1_with_context1() instead of get_sha1() in rev-parse
so that the --quiet flag is honored.
Signed-off-by: David Aguilar
---
This patch now has the t1503 test case squashed into it.
It was previously a separate patc
Use `test_must_be_be_empty ` instead of `test -z "$(cat )"`.
Suggested-by: Fabian Ruch
Signed-off-by: David Aguilar
---
This patch should probably be applied on top of the
da/rev-parse-verify-quiet which is currently in pu
and contains the rev-parse documentation patch.
This patc
On Mon, Sep 15, 2014 at 03:32:37PM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Ensure that rev-parse --verify --quiet is silent when asked
> > about deleted reflog entries.
> >
> > Helped-by: Fabian Ruch
> > Signed-off-by: David Aguilar
>
On Mon, Sep 15, 2014 at 12:19:06PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > David Aguilar writes:
> >
> >> Teach check-header.sh to ensure that the first included header in .c
> >> files is either git-compat-util.h, builtin.h, or cache.h.
Use `test_must_be_be_empty ` instead of `test -z "$(cat )"`.
Suggested-by: Fabian Ruch
Signed-off-by: David Aguilar
---
Unchanged since last time, but rebased for the change in the
previous patch.
t/t1503-rev-parse-verify.sh | 12 ++--
1 file changed, 6 insertions(+), 6
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Helped-by: Fabian Ruch
Signed-off-by: David Aguilar
---
Differences since last time:
This goes back to the original approach of using "git update-ref"
plumbing instead of "git branch"
Signed-off-by: David Aguilar
---
This patch is new: we now mention that stdout contains the valid object name
when --quiet is used, which may not be clear when reading this paragraph in
isolation.
Documentation/git-rev-parse.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Helped-by: Fabian Ruch
Signed-off-by: David Aguilar
---
Changes since last time:
Use "git branch test" instead of low-level plumbing commands.
Capture both stdout and stderr in the test.
t
Use `test_must_be_be_empty ` instead of `test -z "$(cat )"`.
Suggested-by: Fabian Ruch
Signed-off-by: David Aguilar
---
t/t1503-rev-parse-verify.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verif
On Sun, Sep 14, 2014 at 06:20:57PM +0200, Fabian Ruch wrote:
> Hi David,
>
> On 09/14/2014 10:30 AM, David Aguilar wrote:
> > Ensure that rev-parse --verify --quiet is silent when asked
> > about deleted reflog entries.
> >
> > Signed-off-by: David Aguilar
>
On Sun, Sep 14, 2014 at 12:55:41AM -0700, Perry Hutchison wrote:
> Junio C Hamano wrote:
> > On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison
> > wrote:
> > > David Aguilar wrote:
> > >> Add a #ifndef guard to ensure that common-cmds.h can only
> > &g
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Signed-off-by: David Aguilar
---
This verifies and depends on "refs: make rev-parse --quiet actually quiet".
t/t1503-rev-parse-verify.sh | 9 +
1 file changed, 9 insertions(+)
diff
Teach check-header.sh to ensure that the first included header in .c
files is either git-compat-util.h, builtin.h, or cache.h.
Ensure that common-cmds.h is only included by help.c.
Move the logic into functions so that we can skip parts of the check.
Signed-off-by: David Aguilar
---
This
ned-off-by: David Aguilar
---
bulk-checkin.c| 1 +
bulk-checkin.h| 2 --
http.c| 1 +
merge-recursive.c | 2 +-
sigchain.c| 2 +-
test-regex.c | 2 +-
test-sigchain.c | 2 +-
varint.c | 1 +
varint.h | 2 --
9 files changed, 7 insertions(+), 8
On Sat, Sep 13, 2014 at 10:23:03PM -0700, Junio C Hamano wrote:
> On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison
> wrote:
> > David Aguilar wrote:
> >> Add a #ifndef guard to ensure that common-cmds.h can only
> >> be included by help.c.
> >
> > T
Add a #ifndef guard to ensure that common-cmds.h can only
be included by help.c.
Suggested-by: Junio C Hamano
Signed-off-by: David Aguilar
---
generate-cmdlist.sh | 4
help.c | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/generate-cmdlist.sh b/generate
ned-off-by: David Aguilar
---
Changes since last time:
This patch was redone to no longer add git-compat-util.h
additions, as it was run using the new check-headers.
The unicode interval types were moved into unicode_width.h
to minimize dependencies.
archive.h | 1 +
attr.h
-by: Matthieu Moy
Signed-off-by: David Aguilar
---
Changes since last time:
We now automatically include git-compat-util.h during the check
per the CodingGuidelines rule to always include it in all .c files.
We now use a case statement to special-case common-cmds.h, which
allows us to replace
On Fri, Sep 12, 2014 at 12:05:48PM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Use `git rev-parse --verify --quiet` instead of redirecting
> > stderr to /dev/null.
> >
> > Signed-off-by: David Aguilar
> > ---
>
> Has this patch ever be
bitfield through the get_sha1_with_context()
so that read_ref_at() can suppress the message.
Use get_sha1_with_context1() instead of get_sha1() in rev-parse
so that the --quiet flag is honored.
Signed-off-by: David Aguilar
---
This should be applied before "stash: prefer --quiet over shell redirection"
w
On Mon, Sep 08, 2014 at 12:57:46PM -0700, Junio C Hamano wrote:
> Matthieu Moy writes:
>
> > Junio C Hamano writes:
> >
> >> David Aguilar writes:
> >>
> >>> +IFS='
> >>> +'
> >>> +git ls-files *.h ewah/*.h vcs
On Mon, Sep 08, 2014 at 04:36:49PM +0200, R. Klomp wrote:
> Ok great! That indeed fixed the issue.
> Although I still don't understand why it didn't work without -solo..
> since it didn't work when no instance of Beyond Compare was running as
> well.
>
> There must be something not quite right in
On Sun, Sep 07, 2014 at 12:01:00PM +0100, Ramsay Jones wrote:
> On 07/09/14 11:35, René Scharfe wrote:
> > Am 07.09.2014 um 11:36 schrieb David Aguilar:
> >> Add dependent headers so that including a header does not
> >> require including additional headers.
> >>
On Sun, Sep 07, 2014 at 12:49:18PM -0700, Jonathan Nieder wrote:
> David Aguilar wrote:
>
> > Add dependent headers so that including a header does not
> > require including additional headers.
>
> I agree with this goal, modulo the compat-util.h caveat. Th
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that "gcc -c $header" succeeds for each header.
Helped-by: René Scharfe
Signed-off-by: David Aguilar
---
Replacement patch with René's suggestions squashed
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that "gcc -c $header" succeeds for each header.
Signed-off-by: David Aguilar
---
Addresses René's note to not include strbuf.h when cache.h is already
includ
This allows us to ensure that each header can be included
individually without needing to include other headers first.
Signed-off-by: David Aguilar
---
Changes since v1:
We now include xdiff, ewah, and vcs-svn headers.
Makefile | 6 ++
check-headers.sh | 29
On Sat, Sep 06, 2014 at 07:58:09PM -0400, Jeff King wrote:
> On Sat, Sep 06, 2014 at 03:57:39PM -0700, David Aguilar wrote:
>
> > > This checks all .h files in the top directory. Would it be better
> > > to check all files in LIB_H instead? Or even all .h files in the
&
On Sat, Sep 06, 2014 at 11:20:32PM +0200, René Scharfe wrote:
> Am 06.09.2014 um 21:20 schrieb David Aguilar:
> >This allows us to ensure that each header can be included
> >individually without needing to include other headers first.
>
> Sounds like a good objective.
>
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that "gcc -c $header" succeeds for each header.
Signed-off-by: David Aguilar
---
This patch was prepared by using the "check-headers" target introduced
by PATCH
This allows us to ensure that each header can be included
individually without needing to include other headers first.
Signed-off-by: David Aguilar
---
This patch demonstrates how to verify PATCH 2/2.
Makefile | 6 ++
check-headers.sh | 26 ++
2 files
On Tue, Sep 02, 2014 at 11:32:02AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Remove includes that have already been included by another header.
>
> Hmm, I am not sure if that is a good move, and suspect that it is
> incompatible with what your 2/3 attemp
Signed-off-by: David Aguilar
---
This is an RFC patch but this is probably fine as-is,
and is orthogonal to the next two patches.
builtin/clone.c | 7 ---
commit.c| 2 +-
commit.h| 2 +-
reflog-walk.c | 2 +-
reflog-walk.h | 2 +-
refs.h | 2 +-
remote-curl.c
Remove includes that have already been included by another header.
Signed-off-by: David Aguilar
---
This patch is the culmination of the previous patches and
is a pure removal.
builtin/add.c | 3 ---
builtin/blame.c | 4
builtin/branch.c| 4
builtin
Add missing includes or forward declarations where needed.
Signed-off-by: David Aguilar
---
If enum date_type were moved to object.h then we wouldn't need
to include cache.h from commit.h, but this patch doesn't touch that.
If we want to avoid including cache.h, another possibility
Use `git rev-parse --verify --quiet` instead of redirecting
stderr to /dev/null.
Signed-off-by: David Aguilar
---
git-stash.sh | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index bcc757b..2ff8b94 100755
--- a/git-stash.sh
+++ b/git
On Sat, Aug 30, 2014 at 11:07:13PM +0200, Johannes Sixt wrote:
> Am 30.08.2014 21:30, schrieb David Aguilar:
> > @@ -392,12 +392,12 @@ parse_flags_and_rev()
> > ;;
> > esac
> >
> > - REV=$(git rev-parse --quiet --symbolic --verify "$1&qu
Use `git rev-parse --quiet` instead of redirecting to /dev/null.
Signed-off-by: David Aguilar
---
git-stash.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index bcc757b..5a5185b 100755
--- a/git-stash.sh
+++ b/git-stash.sh
`git rev-parse` is being called with --quiet so there's no need to
redirect to /dev/null.
Signed-off-by: David Aguilar
---
git-bisect.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-bisect.sh b/git-bisect.sh
index 1e0d602..c1c2321 100755
--- a/git-bisect.sh
+++
On Tue, Aug 26, 2014 at 01:33:12PM -0400, Jeff King wrote:
> On Tue, Aug 26, 2014 at 10:24:35AM -0700, Junio C Hamano wrote:
>
> > Jeff King writes:
> >
> > > ... But we are left with three options:
> > >
> > > 1. Add "git remote list" with verbose output. This is bad because it
> > > dif
On Tue, Jul 29, 2014 at 12:53:29AM -0700, David Aguilar wrote:
> On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote:
> > diff --git a/git-difftool.perl b/git-difftool.perl
> > index 18ca61e..598fcc2 100755
> > --- a/git-difftool.perl
> > +++ b/git-diffto
On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote:
> From: Charles Bailey
>
> git-difftool used to create a command list script containing $( ... )
> and explicitly call "sh -c" with this list.
>
> Instead, allow mergetool --tool-help to take a mode parameter and call
> mergetool di
On Thu, Jun 26, 2014 at 01:42:04PM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> > on mkdtemp, which is not available on Windows.
> >
> > Use the original temporary directory behavio
On Mon, Jun 16, 2014 at 11:17:46AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Hmm.. I guess what I could do is keep the old behavior (having gitk ignore
> > TMPDIR)
> > on Windows and only use the new code path on non-Windows.
>
> Or perhaps atte
available.
Helped-by: Junio C Hamano
Helped-by: brian m. carlson
Signed-off-by: David Aguilar
---
gitk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 41e5071..9237830 100755
--- a/gitk
+++ b/gitk
@@ -3504,7 +3504,9 @@ proc gitknewtmpdir {} {
set
.
Reported-by: Pat Thoyts
Helped-by: brian m. carlson
Signed-off-by: David Aguilar
---
gitk | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/gitk b/gitk
index 41e5071..66d8c9e 100755
--- a/gitk
+++ b/gitk
@@ -3496,15 +3496,22 @@ proc gitknewtmpdir
On Sun, Jun 15, 2014 at 04:32:27PM +, brian m. carlson wrote:
> On Sun, Jun 15, 2014 at 08:51:23AM +0100, Pat Thoyts wrote:
> > David Aguilar writes:
> > >--- a/gitk
> > >+++ b/gitk
> > >@@ -3502,7 +3502,8 @@ proc gitknewtmpdir {} {
> > &
gitk uses a predictable ".gitk-tmp.$PID" pattern when generating
a temporary directory.
Use "mktemp -d .gitk-tmp.XX" to harden gitk against someone
seeding /tmp with files matching the pid pattern.
Signed-off-by: David Aguilar
---
This issue was brought up during the
iting temporary files.
Signed-off-by: David Aguilar
---
gitk | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 90764e8..82293dd 100755
--- a/gitk
+++ b/gitk
@@ -3492,10 +3492,17 @@ proc flist_hl {only} {
}
proc gitknewtmpdir {} {
-global di
[Resent using René's correct email address this time, sorry for the noise]
On Fri, Jun 06, 2014 at 07:55:58AM -0700, Elia Pinto wrote:
> The construct is error-prone; "test" being built-in in most modern
> shells, the reason to avoid "test && test " spawning
> one extra process by using a single
On Tue, Jun 10, 2014 at 11:49:15AM -0700, David Aguilar wrote:
> On Fri, Jun 06, 2014 at 07:55:58AM -0700, Elia Pinto wrote:
> > The construct is error-prone; "test" being built-in in most modern
> > shells, the reason to avoid "test && test " spawn
On Fri, Jun 06, 2014 at 07:55:58AM -0700, Elia Pinto wrote:
> The construct is error-prone; "test" being built-in in most modern
> shells, the reason to avoid "test && test " spawning
> one extra process by using a single "test -a " no
> longer exists.
>
> Signed-off-by: Elia Pinto
> ---
> t/t
On Fri, Jun 06, 2014 at 07:55:52AM -0700, Elia Pinto wrote:
> The construct is error-prone; "test" being built-in in most modern
> shells, the reason to avoid "test && test " spawning
> one extra process by using a single "test -a " no
> longer exists.
>
> Signed-off-by: Elia Pinto
> ---
> git
On Fri, Jun 06, 2014 at 07:55:48AM -0700, Elia Pinto wrote:
> The construct is error-prone; "test" being built-in in most modern
> shells, the reason to avoid "test && test " spawning
> one extra process by using a single "test -a " no
> longer exists.
>
> Signed-off-by: Elia Pinto
> ---
> con
On Fri, Jun 06, 2014 at 07:55:46AM -0700, Elia Pinto wrote:
> The construct is error-prone; "test" being built-in in most modern
> shells, the reason to avoid "test && test " spawning
> one extra process by using a single "test -a " no
> longer exists.
>
> Signed-off-by: Elia Pinto
> ---
> con
.
>
> Signed-off-by: Elia Pinto
> ---
This looks good to me. Thanks Elia,
Acked-by: David Aguilar
> git-mergetool.sh |4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index d08dc92..9a046b7 1
sh: test: too many arguments
>
> because it groups "test -n = -a" and is left with "a = b".
>
> Similarly, if $x is "-f", these
>
>$ test "$x"
>$ test "$x" || test c = d
>
> correctly adds an implicit "-n&
On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> [Cc:ing Charles in case he has an opinion, this behavior dates back to the
>> original MT]
>>
>> On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
>&
On Sun, Apr 20, 2014 at 05:41:05PM -0500, Felipe Contreras wrote:
> = Reject non-fast-forward pulls by default =
>
> Many new-comers end up making merges by mistake when they pull because
> they don't understand what is a non-fast-forward and what they should
> actually be doing. Most people, even
pecially useful with merge.conflictstyle=diff3.
This is a nice addition, thanks.
FWIW,
Acked-by: David Aguilar
>
> Signed-off-by: Felipe Contreras
> ---
>
> How a conflict looks:
> http://felipec.org/vimdiff3-conflict.png
>
> How it looks resolved:
> http://felipec.org/vimdif
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
> It's annoying to see the prompt:
>
> Hit return to start merge resolution tool (foo):
>
> Every time the user does 'git mergetool' even i
On Fri, Mar 7, 2014 at 8:07 AM, Paul Lotz wrote:
> David,
>
> I investigated further and found that \"$LOCAL\" \"$REMOTE\" return the
> remote and local files (reversed). (One can easily see this in my 2/28
> e-mail.) Reversing these (\"$REMOTE\" \"$LOCAL\") does indeed reverse the
> output.
From: Junio C Hamano
Signed-off-by: David Aguilar
---
This is a replacement patch for the current tip of da/difftool.
t/t7800-difftool.sh | 14 ++
1 file changed, 14 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 2418528..986b78e 100755
--- a/t/t7800
On Mon, Mar 03, 2014 at 04:24:15PM -0700, Paul Lotz wrote:
> David,
>
> OK, I did as you suggested, and the results were revealing.
>
> First, I replaced "echo" with "cat". Result: The contents of both files
> appeared in the Git Bash Window.
>
> Then I tried calling LVCompare from the Git Bas
On Mon, Feb 24, 2014 at 8:44 AM, Paul Lotz wrote:
> David,
>
> Thanks for the helpful reply.
>
> As you suggested, I modified the .gitconfig file to have:
> [difftool "test"]
> cmd = echo \"$LOCAL\" \"$REMOTE\"
>
> and ran
> $ git difftool -t test
>
> An example of the the resulting consol
le.
Reported-by: Gábor Lipták
Helped-by: Jens Lehmann
Helped-by: John Keeping
Signed-off-by: David Aguilar
---
git-difftool.perl | 18 ++
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index e57d3d1..18ca61e 100755
---
On Mon, Feb 17, 2014 at 03:14:01PM -0700, Paul Lotz wrote:
> From the Git Bash command line, I enter
> $ git difftool
>
> and type y when the file I want to difference appears. Git correctly
> calls the external diff tool (LVCompare.exe), but the path for the remote
> file Git passes to that to
On Thu, Feb 20, 2014 at 1:03 PM, Jens Lehmann wrote:
> Sorry for the late reply, but here we go ...
>
> Am 10.02.2014 07:33, schrieb Gábor Lipták:
>> Hi Jens,
>>
>> So "git status" says:
>>
>> liptak@liptak-kubuntu:~/Projects/MAIN_MODULE/platform/SUBMODULE
>> [master]$ git status
>> # On branch ma
On Sun, Feb 02, 2014 at 04:15:09PM -0600, Stephen Leake wrote:
> I'm working on the DVC Emacs front-end for git
> (http://www.emacswiki.org/emacs/DistributedVersionControl), adding
> features similar to the ones I added for monotone
> (http://www.monotone.ca). I'm used to monotone and new to git, s
Add a `pull.ff` configuration option that is analogous
to the `merge.ff` option.
This allows us to control the fast-forward behavior for
pull-initiated merges only.
Signed-off-by: David Aguilar
---
Documentation/config.txt | 10 ++
git-pull.sh | 15
Signed-off-by: David Aguilar
---
git-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-pull.sh b/git-pull.sh
index 7dbf6b1..68b2e40 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,7 +4,7 @@
#
# Fetch one or more remote refs and merge it/them into the current HEAD
On Fri, Nov 15, 2013 at 2:34 AM, wrote:
> OK, thanks for these informations.
> From a user perspective, having this volume of devel mails flooding all the
> bugs mail is very annoying.
> And following the status of a bug and the history of this bug is very hard
> too.
> The bugzilla approach is
Thanks for the patch, and sorry for the late response.
I have just a couple of notes below...
On Fri, Dec 06, 2013 at 10:38:46AM +1100, Zoltan Klinger wrote:
> diff --git a/diff.c b/diff.c
> index e34bf97..a7d5a47 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -2899,11 +2899,16 @@ static void run_exter
On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote:
> On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar wrote:
> > On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote:
> >> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote:
> >&g
On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote:
> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote:
> > Junio C Hamano writes:
>
> > The other reason the original did not say "origin/master" is because
> > this holds true even if you do not have such a remote-tracking
> >
On Thu, Oct 31, 2013 at 11:07:19AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > A-ha.. I think adding the chdir to alias is possible using a function.
>
> You do not have to use a function to do so, no?
Right, of course.
So something like:
[alias]
On Thu, Oct 31, 2013 at 11:36:59AM -0400, Eugene Sajine wrote:
> On Wed, Oct 30, 2013 at 11:54 PM, Junio C Hamano wrote:
> > Eugene Sajine writes:
> >
> >> That was my initial intention, because I would like to be able to pass
> >> parameters like to git log or git blame correctly without the exp
On Thu, Oct 24, 2013 at 12:40 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> That would also provide people who do not like the change of default an
>> escape hatch to keep the current behavior. And I do not think scripted
>> use will be inconvenienced; they will already have to use "." or ":
On Wed, Oct 23, 2013 at 12:31 PM, Junio C Hamano wrote:
> Jed Brown writes:
>
>> Junio C Hamano writes:
>>
>>> Jed Brown writes:
>>>
Junio C Hamano writes:
> I suspect that it would be too late for 2.0 we want to do sometime
> early next year, though.
How would you manag
On Sat, Oct 12, 2013 at 12:07 AM, Felipe Contreras
wrote:
> Virtually all packaging guidelines would prefer 1.8.4~rc1, over
> 1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead.
>
> In particular, the only packaging we provide, git.spec, generates a
> wrong version, because git-1.8.4 <
ipt `/usr/bin/diffmerge` that can be used to launch
> the
> graphical compare tool.
>
> This change adds mergetool support for DiffMerge and adds 'diffmerge' as an
> option to the mergetool help.
>
> Signed-off-by: Stefan Saasen
> Acked-by: David Aguilar
>
Stefan Saasen wrote:
>Thanks for the review David, much appreciated.
>
>> I think this line was already too long in its current form. Would
>you mind
>> splitting up this long line?
>
>I've updated the patch and had a look at how to avoid repeating the
>list of
>available merge/difftools.
>
>> ..
On Sat, Oct 5, 2013 at 1:29 AM, Stefan Saasen wrote:
> DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and
> Linux.
>
> See http://www.sourcegear.com/diffmerge/
>
> DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch
> the
> graphical compare too
On Fri, Oct 4, 2013 at 7:34 AM, Stefan Saasen wrote:
> The help text for the `tool` flag should mention:
>
> --tool=
>
> instead of:
>
> --tool-
>
> Signed-off-by: Stefan Saasen
> ---
Good eyes!
Reviewed-by: David Aguilar
Thanks
> git-mergetool--l
On Tue, Sep 24, 2013 at 2:07 PM, Jona Christopher Sahnwaldt
wrote:
> Hi,
>
> maybe this has already been reported, but I didn't find it in the mail
> archive.
>
> If I understand correctly, after I clone a repo, I should be able to
> switch to branch foo just by running
>
> git checkout foo
>
> T
Felipe Contreras wrote:
>David Aguilar wrote:
>> Felipe Contreras wrote:
>> >On Sat, Sep 21, 2013 at 1:58 PM, Johannes Sixt wrote:
>> >> Am 21.09.2013 13:47, schrieb Felipe Contreras:
>> >>> diff --git a/Makefile b/Makefile
>> >>> inde
Felipe Contreras wrote:
>On Sat, Sep 21, 2013 at 1:58 PM, Johannes Sixt wrote:
>> Am 21.09.2013 13:47, schrieb Felipe Contreras:
>>> diff --git a/Makefile b/Makefile
>>> index 3588ca1..18081bf 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -1010,7 +1010,7 @@ ifndef sysconfdir
>>> ifeq ($(pr
Felipe Contreras wrote:
>For now simply add a few common aliases.
>
> co = checkout
> ci = commit
> rb = rebase
> st = status
>
>Signed-off-by: Felipe Contreras
>---
> Documentation/git-checkout.txt | 5 +
> Documentation/git-commit.txt | 5 +
> Documentation/git-rebase.txt | 5
Felipe Contreras wrote:
>I know 'git ci' is perfectly fine shortcut to 'git commit'.
>
>Either way, it doesn't matter. Even if we agree that /etc/gitconfig.d
>is what we want, or we add an /usr/share/git/config, Junio is not
>going to apply any patch, even if it's what most users want.
Please sto
Felipe Contreras wrote:
>David Aguilar wrote:
>> Felipe Contreras wrote:
>> >On Wed, Sep 18, 2013 at 9:30 PM, David Aguilar
>> >wrote:
>> >>>On Wed, Sep 18, 2013 at 1:13 PM, David Aguilar
>> >wrote:
>> >>>>
>&
Felipe Contreras wrote:
>On Wed, Sep 18, 2013 at 9:30 PM, David Aguilar
>wrote:
>>>On Wed, Sep 18, 2013 at 1:13 PM, David Aguilar
>wrote:
>>>>
>>>> Will this not conflict with folks that supply their own gitconfig?
>>
>>> You mean
>On Wed, Sep 18, 2013 at 1:13 PM, David Aguilar wrote:
>>
>> Will this not conflict with folks that supply their own gitconfig?
> You mean people that provide their own ETC_GITCONFIG? If you mean
distributions, their packaging would override /etc/gitconfig, if you
mean people t
201 - 300 of 580 matches
Mail list logo
