Thanks.
Looked alright from a cursory read; I tweaked s/10/-10/ where you
gave examples of limiting output from "git log" before queuing.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kern
This is hopefully the final revision of the patch...
and integrates Junio's comments.
I've eye-balled the man page and web page results, and corrected a few quote /
back tick
items to be more consistent.
Re: [PATCH v3 1/3] doc: modernise everyday.txt wording and format in man page
style
From:
Refresh the contents of everyday.txt contents to a more modern
command style. Also update the mark-up so that it can be formatted
as a man page with AsciiDoc ready for transfer to the Git guides.
The transfer is in subsequent commits.
Guidance on modernising the command style provided by Junio at
Helped-by: Junio C Hamano
Signed-off-by: Philip Oakley
---
Documentation/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index cea0e7a..3b56714 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -5,6
The "Everyday GIT With 20 Commands Or So" is not accessible via the
Git help system. Move everyday.txt to giteveryday.txt so that "git
help everyday" works, and create a new placeholder file everyday.html
to refer people who follow existing URLs to the updated location.
giteveryday.txt now format
On Fri, Oct 10, 2014 at 02:50:15PM -0400, Cameron Smith wrote:
> The git-log documentation page
> http://git-scm.com/docs/git-log
> enters into a quoted block for the description of the "format:"
> option and never exits.
Thanks for the report. Someone noticed that a few days ago and I sent a
pat
Joey Hess writes:
> I have found many uses for the feature that lets a pre-commit hook stage
> changes in the index that will be included in the commit. But now I seem
> to have found a bug in the support for that, involving partial commits.
>
> It seems that, after a partial commit in which the
Jakub Narębski writes:
> Why use expr and not POSIX shell parameter substitution?
>
> BASE=${MERGED%.*}
> ext=.${MERGED##*.}
>
> Or something like that...
Because they are insufficient. See David's illustrations for how.
Parameter expansion (e.g. ${parameter%word}) is fine for the
simplest cas
Am 10.10.2014 um 20:48 schrieb David Aguilar:
> On Fri, Oct 10, 2014 at 01:19:40PM +0200, Jakub Narębski wrote:
>> David Aguilar wrote:
>>> Avoid filenames with multiple dots so that overly-picky tools do
>>> not misinterpret their extension.
>>>
>>> Previously, foo/bar.ext in the worktree would re
The git-log documentation page
http://git-scm.com/docs/git-log
enters into a quoted block for the description of the "format:"
option and never exits.
-Cameron
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo
On Fri, Oct 10, 2014 at 01:19:40PM +0200, Jakub Narębski wrote:
> David Aguilar wrote:
> >Avoid filenames with multiple dots so that overly-picky tools do
> >not misinterpret their extension.
> >
> >Previously, foo/bar.ext in the worktree would result in e.g.
> >
> > ./foo/bar.ext.BASE.1234.ext
On Fri, Oct 10, 2014 at 10:07:20AM +0100, Charles Bailey wrote:
> While you have the lid of this section of code, should we
> consider (optionally?) using a tmpdir to alleviate the eclipse
> issue where it wants temporary merge files to be the canonical
> locations for definitions of things that it
I have found many uses for the feature that lets a pre-commit hook stage
changes in the index that will be included in the commit. But now I seem
to have found a bug in the support for that, involving partial commits.
It seems that, after a partial commit in which the pre-commit hook
stages a modi
Ok. thanks!
David: I'm pretty sure matlab won't do that change soon :)
Sergio
On Wed, Oct 8, 2014 at 2:25 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> In any case, it might be worth adjusting mergetool to use a more
>> conservative path (underscores instead of dots) since there
>> doe
On Fri, Oct 10, 2014 at 7:02 PM, Thomas Braun
wrote:
> Are you compiling git.git or msysgit.git?
git.git
> And how about the test suite?
running right now, fingers crossed.. kinda slow, not sure if it's wine
or it's the msys thing.
--
Duy
--
To unsubscribe from this list: send the line "unsubs
Am 10.10.2014 um 13:58 schrieb Duy Nguyen:
> Just wanted to share that with at least wine 1.7.23 I can install
> msysgit using the netboot method, clone and build git ok. I had to do
> this to make gcc works actually, but it's probably no big deal
>
> $ mkdir -p ~/.wine/drive_c/usr/libexec/gcc/min
Just wanted to share that with at least wine 1.7.23 I can install
msysgit using the netboot method, clone and build git ok. I had to do
this to make gcc works actually, but it's probably no big deal
$ mkdir -p ~/.wine/drive_c/usr/libexec/gcc/mingw32 -p
$ cp ~/.wine/drive_c/msysgit/mingw/bin/as.exe
David Aguilar wrote:
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
./foo/bar.ext.BASE.1234.ext
This can be improved by having only a single .ext and using
underscore instea
Hi,
On Fri, 10 Oct 2014, Johannes Schindelin wrote:
> With this [mingw-w64] compiler, and the 'w64' branch from
> https://github.com/dscho/git – intended to be merged into
> https://github.com/git-for-windows/git – the following command-line
> produces 64-bit Git:
>
> PATH=/path/to/unpacke
On 10 Oct 2014, at 09:51, David Aguilar wrote:
> Changes since v1:
>
> NONGIT_OK=Yes was added to make it actually work outside of a git repo.
Does this actually work? The reason that I haven't got around to resending my
re-roll is that I found that I needed changes to git-sh-setup.sh because d
While you have the lid of this section of code, should we consider
(optionally?) using a tmpdir to alleviate the eclipse issue where it wants
temporary merge files to be the canonical locations for definitions of things
that it finds when scanning source files in the project tree?
[Apologies fo
From: Charles Bailey
Signed-off-by: Charles Bailey
Signed-off-by: David Aguilar
---
Changes since v1:
NONGIT_OK=Yes was added to make it actually work outside of a git repo.
git-mergetool.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-mergetool.sh b/git-mergeto
From: Charles Bailey
git-difftool used to create a command list script containing $( ... )
and explicitly calls "sh -c" with this list.
Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
parameter is intented
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
./foo/bar.ext.BASE.1234.ext
This can be improved by having only a single .ext and using
underscore instead of dot so that the ex
On Wed, Oct 08, 2014 at 12:52:24PM -0700, Junio C Hamano wrote:
> The whole reason why the actualy diff.*.command and textconv
> commands are defined in .git/config while the filetype label is
> assigned by in-tree .gitattributes is because these commands are
> platform dependant. So textconv on
On Thu, Oct 09, 2014 at 11:36:00AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > Avoid filenames with multiple dots so that overly-picky tools do
> > not misinterpret their extension.
> >
> > Previously, foo/bar.ext in the worktree would result in e.g.
> >
> > foo/bar.ext.BASE.12
26 matches
Mail list logo
