From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Gary V. Vaughan" <git@mlists.thewrittenword.com>
Subject: Re: What's cooking in git.git (Jun 2010, #01; Wed, 2)
Date: Sat, 5 Jun 2010 14:32:47 -0500 [thread overview]
Message-ID: <20100605193247.GA5573@progeny.tock> (raw)
In-Reply-To: <7v39x1z72z.fsf@alter.siamese.dyndns.org>
Jun 05, 2010 at 11:07:32AM -0700, Junio C Hamano wrote:
> @@ -1582,6 +1583,7 @@ define cmd_munge_script
> $(RM) $@ $@+ && \
> sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
> -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
> + -e 's|@@DIFF@@|$(DIFF_SQ)|' \
> -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
> -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
> -e $(BROKEN_PATH_FIX) \
> diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
> index 3145009..b86402a 100755
> --- a/git-merge-one-file.sh
> +++ b/git-merge-one-file.sh
> @@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
> # remove lines that are unique to ours.
> orig=`git-unpack-file $2`
> sz0=`wc -c <"$orig"`
> - $DIFF -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
> + @@DIFF@@ -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
> sz1=`wc -c <"$orig"`
>
> # If we do not have enough common material, it is not
Looks good to me. Thanks.
next prev parent reply other threads:[~2010-06-05 19:32 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-02 23:36 What's cooking in git.git (Jun 2010, #01; Wed, 2) Junio C Hamano
2010-06-03 3:13 ` Tay Ray Chuan
2010-06-04 8:21 ` [PATCH v3 3/3] commit::print_summary(): set rev_info.always_show_header to 1 Tay Ray Chuan
2010-06-04 8:34 ` Tay Ray Chuan
2010-06-05 6:44 ` Junio C Hamano
2010-06-07 5:04 ` [PATCH v4] " Tay Ray Chuan
2010-06-03 8:40 ` What's cooking in git.git (Jun 2010, #01; Wed, 2) Michael J Gruber
2010-06-03 18:25 ` mg/rev-parse-option-sifter-deprecation Jonathan Nieder
2010-06-03 13:36 ` [PATCH 1/2] separate quoting and relative path generation Clemens Buchacher
2010-06-03 13:39 ` [PATCH 2/2] ls-files: allow relative pathspec Clemens Buchacher
2010-06-03 22:16 ` [PATCH 1/2] separate quoting and relative path generation Junio C Hamano
2010-06-04 7:44 ` [PATCH] optimize path_relative() Clemens Buchacher
2010-06-04 7:50 ` Clemens Buchacher
2010-06-05 8:04 ` [PATCH] setup: document prefix Clemens Buchacher
2010-06-05 7:37 ` [PATCH v2] optimize path_relative() Clemens Buchacher
2010-06-05 18:07 ` Junio C Hamano
2010-06-03 14:36 ` What's cooking in git.git (Jun 2010, #01; Wed, 2) Thomas Rast
2010-06-03 19:53 ` Eyvind Bernhardsen
2010-06-04 21:18 ` Jonathan Nieder
2010-06-05 18:07 ` Junio C Hamano
2010-06-05 19:32 ` Jonathan Nieder [this message]
2010-06-05 23:57 ` Sverre Rabbelier
2010-06-06 4:00 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2010-05-24 9:47 [PATCH 0/3] commit: fix abbrev-sha regression Tay Ray Chuan
2010-05-24 9:47 ` [PATCH 1/3] t7502-commit: add tests for summary output Tay Ray Chuan
2010-05-24 9:47 ` [PATCH 2/3] t7502-commit: add summary output tests for empty and merge commits Tay Ray Chuan
2010-05-24 9:47 ` [PATCH 3/3] commit: show abbreviated sha for commits with empty diffs Tay Ray Chuan
2010-05-26 5:07 ` Junio C Hamano
2010-05-26 5:37 ` Tay Ray Chuan
2010-05-26 5:39 ` Tay Ray Chuan
2010-05-26 5:07 ` [PATCH 2/3] t7502-commit: add summary output tests for empty and merge commits Junio C Hamano
2010-05-26 5:19 ` Tay Ray Chuan
2010-05-27 15:34 ` [PATCH v2 0/3] commit: fix abbrev-sha regression Tay Ray Chuan
2010-05-27 15:34 ` [PATCH v2 1/3] t7502-commit: add tests for summary output Tay Ray Chuan
2010-05-27 15:34 ` [PATCH v2 2/3] t7502-commit: add summary output tests for empty and merge commits Tay Ray Chuan
2010-05-27 15:34 ` [PATCH v2 3/3] commit::print_summary(): set rev_info.always_show_header to 1 Tay Ray Chuan
2010-05-29 1:10 ` Junio C Hamano
2010-05-29 1:41 ` Tay Ray Chuan
2010-06-12 14:15 ` [PATCH v6 3/3] commit::print_summary(): don't use format_commit_message() Tay Ray Chuan
2010-05-27 16:58 ` [PATCH v2 0/3] commit: fix abbrev-sha regression Will Palmer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100605193247.GA5573@progeny.tock \
--to=jrnieder@gmail.com \
--cc=git@mlists.thewrittenword.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.