On Mon, Oct 27, 2014 at 07:16:49AM +0100, Richard PALO wrote:
> Hash: SHA1
>
> I'm having an issue in that 'git ls-files -o' seems to ignore
> [parts of] .gitignore whereas other commands, such as 'git status'
> seem fine.
This is, as far as I am aware, by design. If you want to apply the
standar
Hin-Tak Leung wrote:
> On Sat, Oct 25, 2014 00:34 BST Eric Wong wrote:
> >0006 is insufficient and incompatible with older SVN.
> >I pushed "git-svn: reload RA every log-window-size"
> >(commit dfa72fdb96befbd790f623bb2909a347176753c2) instead
> >which saves much more memory:
>
> it is fetching ag
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
I'm having an issue in that 'git ls-files -o' seems to ignore
[parts of] .gitignore whereas other commands, such as 'git status'
seem fine.
Here is an example:
> richard@omnis:/home/richard/src/pkgsrc$ export LANG=C
> richard@omnis:/home/richard/src/
On zo, 2014-10-26 at 22:27 -0700, Cong Wang wrote:
>
> My question is how to edit dozens of git commit changelogs
> automatically?
You can use git filter-branch in --msg-filter mode.
--
Dennis Kaarsemaker
www.kaarsemaker.net
--
To unsubscribe from this list: send the line "unsubscribe git" in
t
Hello, git experts
Sorry if this is a question already answered, but google search didn't
give me anything useful.
My question is how to edit dozens of git commit changelogs automatically?
Let's say I want to fix a stupid typo in all of these commits, as
simply as s/foo/bar/. Usually I use`git
On Sun, Oct 26, 2014 at 02:54:56PM -0400, David Michael wrote:
> Yes, the compiler refuses to run by default when a "-L" option occurs
> after a source/object file. It tries to interpret it as another file
> name and fails.
Yeah, I think I have seen similar behavior before, but it has been long
On Sun, Oct 26, 2014 at 04:04:01PM -0400, David Michael wrote:
> I'm not 100% sure if __THW_LITTLE_ENDIAN__ will ever be defined, so
> I'd be okay with dropping those references completely. There is a
> recent version of the compiler for little endian Linux distributions,
> but I haven't found th
On Mon, Oct 27, 2014 at 12:13:41AM +, brian m. carlson wrote:
> I did note Peff's suggestion to add a macro to enable the use of
> Asciidoctor, but I want to defer that until a later point. There isn't
> a released version of Asciidoctor with the necessary changes and I'd
> like to avoid conf
This memoization appears unneeded as the check_cherry_pick2 cache is
in front of it does enough.
With this change applied, importing from local svn+ssh and http copies
of the R repo[1] takes only 2:00 (2 hours) on my system and the git-svn
process never uses more than 60MB RSS on my x86-64 GNU/Lin
Teach difftool to exit when a diff tool returns a non-zero exit
code when either --trust-exit-code is specified or
difftool.trustExitCode is true.
Forward exit codes from invoked diff tools to the caller when
--trust-exit-code is used.
Suggested-by: Adri Farr <14farr...@gmail.com>
Helped-by: Joha
Signed-off-by: David Aguilar
---
This patch is new since v2.
This series now depends on "difftool--helper: exit when reading a prompt answer
fails".
t/t7800-difftool.sh | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.s
On Sun, Oct 26, 2014 at 05:41:49PM -0700, David Aguilar wrote:
> On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote:
> > An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
> > not quit it, but is treated as if 'yes' was answered to the prompt and
> > all following pro
my name is ming yang,i work with Hang Seng Bank Ltd Hong Kong.i want you to be
the next of kin of my late client late Gen. Aadel Akgaal, respond
--
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://vg
On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote:
> An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
> not quit it, but is treated as if 'yes' was answered to the prompt and
> all following prompts, which is contrary to the user's intent. Fix the
> error check.
>
This series is essentially the same as the previous v2, but against next
instead. It moves most of the AsciiDoc operations into a set of
variables (TXT_TO_HTML and TXT_TO_XML) as Junio suggested, and removes
the extensions.rb file, as it is not needed.
I did note Peff's suggestion to add a macro
The Makefile performs several very similar tasks to convert AsciiDoc
files into either HTML or DocBook. Move these items into variables to
reduce the duplication.
Signed-off-by: brian m. carlson
---
Documentation/Makefile | 22 +++---
1 file changed, 11 insertions(+), 11 deletio
Asciidoctor provides an extension implementing a backend-independent
macro for dealing with manpage links just like the linkgit macro. As
this is more likely to be up-to-date with future changes in Asciidoctor,
prefer using it over reimplementing in Git.
This reverts commit 773ee47c2b9c691d9758b2
Am 26.10.2014 um 20:02 schrieb Christian Couder:
Yeah. Henning, when interactively rebasing, in our editor, you should
have something like: pick A pick P pick B pick Q pick C pick D pick R
pick E which should work without any conflict. And then you can rebase
the b1 and b2 branches on the resul
On Sun, Oct 26, 2014 at 07:59:55PM +0100, René Scharfe wrote:
> Am 23.10.2014 um 03:09 schrieb brian m. carlson:
> >The pax format is an extension of the tar format. All of the pax
> >implementations I've seen on Linux (OpenBSD's and MirBSD's) don't
> >actually understand the pax headers and emit
On Sun, Oct 26, 2014 at 2:38 PM, Jeff King wrote:
> On Sun, Oct 26, 2014 at 01:34:26PM -0400, David Michael wrote:
>
>> diff --git a/compat/bswap.h b/compat/bswap.h
>> index f6fd9a6..7fed637 100644
>> --- a/compat/bswap.h
>> +++ b/compat/bswap.h
>> @@ -122,6 +122,10 @@ static inline uint64_t git_b
On Sun, Oct 26, 2014 at 4:19 PM, Andreas Schwab wrote:
> Henning Moll writes:
>
>> 1. For P, A is the nearest prior commit on 'master'
>> 2. on master: git rebase -i A^
>> 3. change A from pick to edit. save. quit
>> 4. git merge P
>> 5. git rebase --continue
>>
>> From the perspective of 'master
Am 23.10.2014 um 03:09 schrieb brian m. carlson:
On Wed, Oct 22, 2014 at 11:42:48AM +0200, Michael J Gruber wrote:
Junio C Hamano schrieb am 21.10.2014 um 20:14:
Michael J Gruber writes:
Unfortunately, the git archive doc clearly says that the umask is
applied to all archive entries.
Is an
On Fri, Oct 24, 2014 at 02:24:37PM -0700, Junio C Hamano wrote:
> Just like other hints such as "Change to be committed" we show in
> the editor to remind the committer what paths were involved in the
> resulting commit to improve their log message, this section is
> merely a reminder. Traditiona
On Sun, Oct 26, 2014 at 2:35 PM, Jeff King wrote:
> On Sun, Oct 26, 2014 at 01:45:10PM -0400, Eric Sunshine wrote:
>
>> On Sun, Oct 26, 2014 at 1:33 PM, David Michael wrote:
>> > The XL C compiler can fail due to mixing library path and object
>>
>> Can you explain in the commit message the actua
On Sun, Oct 26, 2014 at 01:34:26PM -0400, David Michael wrote:
> diff --git a/compat/bswap.h b/compat/bswap.h
> index f6fd9a6..7fed637 100644
> --- a/compat/bswap.h
> +++ b/compat/bswap.h
> @@ -122,6 +122,10 @@ static inline uint64_t git_bswap64(uint64_t x)
> # define GIT_BYTE_ORDER GIT_BIG_ENDI
On Sun, Oct 26, 2014 at 01:45:10PM -0400, Eric Sunshine wrote:
> On Sun, Oct 26, 2014 at 1:33 PM, David Michael wrote:
> > The XL C compiler can fail due to mixing library path and object
>
> Can you explain in the commit message the actual nature of the failure
> so that readers can understand
Am 21.10.2014 um 07:56 schrieb Zoltan Klinger:
When git grep is run with combined patterns such as '-e p1 --and -e p2'
and surrounding context lines are requested, the output contains
incorrectly highlighted matches.
Consider the following output (highlighted matches are surrounded by '*'
charac
On Sun, Oct 26, 2014 at 1:33 PM, David Michael wrote:
> The XL C compiler can fail due to mixing library path and object
Can you explain in the commit message the actual nature of the failure
so that readers can understand more precisely how this change helps?
> file arguments, for example when
There is no /usr/include/endian.h equivalent on z/OS, but the
compiler will define macros to indicate endianness on host and
target hardware. This adds a test for these macros as a last
resort for determining byte order.
Signed-off-by: David Michael
---
compat/bswap.h | 4
1 file changed,
The XL C compiler can fail due to mixing library path and object
file arguments, for example when linking git while building with
"gmake LDFLAGS=-L$prefix/lib". This moves the ALL_LDFLAGS variable
expansion in the git executable rule to be consistent with all the
other linking rules.
Signed-off-b
When the XL C compiler is run with an appropriate language level or
suboption, it defines a feature test macro to indicate support for
variadic macros.
This was tested on z/OS, but it should also work on AIX according
to IBM documentation.
Signed-off-by: David Michael
---
git-compat-util.h | 2
On Wed, Oct 22, 2014 at 05:07:31PM +0700, Duy Nguyen wrote:
> On Wed, Oct 22, 2014 at 2:41 PM, Dennis Kaarsemaker
> wrote:
> > I see two options:
> >
> > * Turning that interaction into a more cooperative process, with a
> > select/poll loop
> > * Make upload-pack buffer its entire response when
On Wed, Oct 22, 2014 at 10:11:40AM -0700, Junio C Hamano wrote:
> Dennis Kaarsemaker writes:
>
> > On di, 2014-10-21 at 10:56 -0700, Junio C Hamano wrote:
> >> Dennis Kaarsemaker writes:
> >>
> >> > By not clearing the request buffer in stateless-rpc mode, fetch-pack
> >> > would keep sending a
Henning Moll writes:
> 1. For P, A is the nearest prior commit on 'master'
> 2. on master: git rebase -i A^
> 3. change A from pick to edit. save. quit
> 4. git merge P
> 5. git rebase --continue
>
> From the perspective of 'master' this worked. But as all of the commits
> have been rewritten, th
Am 26.10.2014 um 06:46 schrieb Christian Couder:
Hi,Could you tell us why interactive rebase did not work?
First of all i have to admit that i did not i-rebase-merge, but
i-rebase-cherrypick. Now i tried it with i-rebase-merge and it didn't
work either.
Here's my workflow, which i repeated fo
Scott Johnson writes:
> Do you think there would be any interest in a patch that added this as
> a simple command line option, though? I guess the idea of this patch
> then would simply change this line in the .git/config file for the
> length of the operation (and specified remote), execute the
Hi Brian:
> [remote "origin"]
> fetch = refs/heads/*:refs/heads/*
Yes, you're right, this works just fine as long as I move out from a
branch that's not in the remote in question, for example by doing:
git checkout -b nothing
git fetch
- OR -
git pull
Do you think there would be any interes
An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
not quit it, but is treated as if 'yes' was answered to the prompt and
all following prompts, which is contrary to the user's intent. Fix the
error check.
Signed-off-by: Johannes Sixt
---
Found while reviewing your latest pat
Am 26.10.2014 um 02:38 schrieb David Aguilar:
> diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
> index 7ef36b9..fdbd768 100755
> --- a/git-difftool--helper.sh
> +++ b/git-difftool--helper.sh
> @@ -62,6 +62,8 @@ launch_merge_tool () {
> else
> run_merge_tool "$mer
39 matches
Mail list logo
