[PATCH v4 3/7] tag: add format specifier to gpg_verify_tag

From: Lukas Puehringer Calling functions for gpg_verify_tag() may desire to print relevant information about the header for further verification. Add an optional format argument to print any desired information after GPG verification. Signed-off-by: Lukas Puehringer

[PATCH v4 4/7] builtin/verify-tag: add --format to verify-tag

From: Santiago Torres Callers of verify-tag may want to cross-check the tagname from refs/tags with the tagname from the tag object header upon GPG verification. This is to avoid tag refs that point to an incorrect object. Add a --format parameter to git verify-tag to print

[PATCH v4 1/7] gpg-interface, tag: add GPG_VERIFY_QUIET flag

From: Lukas Puehringer Functions that print git object information may require that the gpg-interface functions be silent. Add GPG_VERIFY_QUIET flag and prevent print_signature_buffer from being called if flag is set. Signed-off-by: Lukas Puehringer

[PATCH v4 2/7] ref-filter: add function to print single ref_array_item

From: Lukas Puehringer ref-filter functions are useful for printing git object information using a format specifier. However, some other modules may not want to use this functionality on a ref-array but only print a single item. Expose a pretty_print_ref function to

[PATCH v4 5/7] builtin/tag: add --format argument for tag -v

From: Lukas Puehringer Adding --format to git tag -v mutes the default output of the GPG verification and instead prints the formatted tag object. This allows callers to cross-check the tagname from refs/tags with the tagname from the tag object header upon GPG

[PATCH v4 7/7] t/t7004-tag: Add --format specifier tests

From: Santiago Torres tag -v now supports --format specifiers to inspect the contents of a tag upon verification. Add two tests to ensure this behavior is respected in future changes. Signed-off-by: Santiago Torres --- t/t7004-tag.sh | 16

[PATCH v4 0/7] Add --format to tag verification

From: Santiago Torres This is the fourth iteration of the series in [1][2][3], which comes as a result of the discussion in [4]. The main goal of this patch series is to bring --format to git tag verification so that upper-layer tools can inspect the content of a tag and make

[PATCH v4 6/7] t/t7030-verify-tag: Add --format specifier tests

From: Santiago Torres Verify-tag now provides --format specifiers to inspect and ensure the contents of the tag are proper. We add two tests to ensure this functionality works as expected: the return value should indicate if verification passed, and the format specifiers must

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Duy Nguyen writes: > On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin > wrote: >> Hi Junio, >> >> On Thu, 6 Oct 2016, Junio C Hamano wrote: >> >>> Nguyễn Thái Ngọc Duy writes: >>> >>> > Throwing something at the mailing list

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Hello, Johannes W dniu 07.10.2016 o 13:20, Johannes Schindelin pisze: > On Thu, 6 Oct 2016, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> Throwing something at the mailing list to see if anybody is >>> interested. >>> >>> Current '!' aliases move cwd to

Re: [PATCH 2/2] use strbuf_add_unique_abbrev() for adding short hashes, part 2

Am 07.10.2016 um 02:46 schrieb Jeff King: On Tue, Sep 27, 2016 at 09:11:58PM +0200, René Scharfe wrote: Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs instead of taking detours through find_unique_abbrev() and its static buffer. This is shorter and a bit more efficient.

Uninitialized submodules as symlinks

Presently, uninitialized submodules are materialized in the working tree as empty directories. We would like to consider having them be symlinks. Specifically, we'd like them to be symlinks into a FUSE filesystem which retrieves files on demand. We've actually already got a FUSE filesystem

Re: [PATCH v2 2/3] serialize collection of refs that contain submodule changes

On Fri, Oct 7, 2016 at 8:06 AM, Heiko Voigt wrote: > We are iterating over each pushed ref and want to check whether it > contains changes to submodules. Instead of immediately checking each ref > lets first collect them and then do the check for all of them in one > revision

Re: [PATCH v4 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

Johannes Schindelin writes: > - changed the exit code to 128 (emulating a die()) if > require_clean_work-tree() was asked to be non-gentle. Ah, I didn't spot this the last round. Good change. Thanks, will replace.

Re: [PATCH 1/2] submodule add: extend force flag to add existing repos

On Fri, Oct 7, 2016 at 5:52 AM, Heiko Voigt wrote: > On Thu, Oct 06, 2016 at 01:11:20PM -0700, Junio C Hamano wrote: >> Stefan Beller writes: >> >> > Currently the force flag in `git submodule add` takes care of possibly >> > ignored files or when a name

Re: What's cooking in git.git (Oct 2016, #02; Thu, 6)

On Fri, Oct 07, 2016 at 09:40:01AM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > Just wondering why the topic "kd/mailinfo-quoted-string (2016-09-28) 2 > > commits" is not listed anymore. Previous what's cooking said it was > > merged to "next". > > Thanks for your

[PATCH v7 2/4] ls-files: optionally recurse into submodules

Allow ls-files to recognize submodules in order to retrieve a list of files from a repository's submodules. This is done by forking off a process to recursively call ls-files on all submodules. Use top-level --super-prefix option to pass a path to the submodule which it can use to prepend to

[PATCH v7 1/4] git: make super-prefix option

Add a super-prefix environment variable 'GIT_INTERNAL_SUPER_PREFIX' which can be used to specify a path from above a repository down to its root. When such a super-prefix is specified, the paths reported by Git are prefixed with it to make them relative to that directory "above". The paths given

[PATCH v7 3/4] ls-files: pass through safe options for --recurse-submodules

Pass through some known-safe options when recursing into submodules. (--cached, -v, -t, -z, --debug, --eol) Signed-off-by: Brandon Williams --- builtin/ls-files.c | 30 +++--- t/t3007-ls-files-recurse-submodules.sh | 16

[PATCH v7 4/4] ls-files: add pathspec matching for submodules

Pathspecs can be a bit tricky when trying to apply them to submodules. The main challenge is that the pathspecs will be with respect to the superproject and not with respect to paths in the submodule. The approach this patch takes is to pass in the identical pathspec from the superproject to the

[PATCH v7 0/4] recursive support for ls-files

Few minor fixes pointed out Stefan Brandon Williams (4): git: make super-prefix option ls-files: optionally recurse into submodules ls-files: pass through safe options for --recurse-submodules ls-files: add pathspec matching for submodules Documentation/git-ls-files.txt | 7 +-

Re: [PATCH v4 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

W dniu 07.10.2016 o 18:08, Johannes Schindelin pisze: > - marked the hint "please commit or stash them" (reintroduced from the > original git-pull.sh script) as translatable. I wonder if we can make automatic check if everything introduced is translatable, for example with something akin to

[PATCH v2] l10n: de.po: translate 260 new messages

Translate 260 new message came from git.pot updates in 9fa976f (l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)) and 5bd166d (l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 783

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Fri, Oct 07, 2016 at 07:42:35PM +0200, Johannes Sixt wrote: > Maybe it's time to aim for > > git config alias.d2u.shell \ >'f() { git ls-files "$@" | xargs dos2unix; }; f' > git config alias.d2u.cdup false > git d2u *.c # yada! That would be nice. It would also allow

Re: "Purposes, Concepts,Misfits, and a Redesign of Git" (a research paper)

On 7 October 2016 at 18:55, Santiago Perez De Rosso wrote: > On Wed, Oct 5, 2016 at 6:15 AM Jakub Narębski wrote: >> On 5 October 2016 at 04:55, Santiago Perez De Rosso >> wrote: >>> On Fri, Sep 30, 2016 at 6:25 PM Jakub Narębski

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Johannes Schindelin writes: > Hi Matthieu, > > On Fri, 7 Oct 2016, Matthieu Moy wrote: > >> Another possibility: !(nocd), which leaves room >> for !(keyword1,keyword2,...) if needed later. Also, it is consistent >> with the :(word) syntax of pathspecs. > > But is this

Re: [PATCH] clean up confusing suggestion for commit references

On Fri, Oct 07, 2016 at 11:56:38AM +0200, Heiko Voigt wrote: > The description for referencing commits looks as if it is contradicting > the example, since it is itself enclosed in double quotes. Lets use > single quotes around the description and include the double quotes in > the description so

[PATCH v4 1/6] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

In cmd_pull(), when verifying that there are no changes preventing a rebasing pull, we diligently pass the prefix parameter to the die_on_unclean_work_tree() function which in turn diligently passes it to the has_unstaged_changes() and has_uncommitted_changes() functions. The casual reader might

[PATCH v4 3/6] wt-status: make the require_clean_work_tree() function reusable

The function used by "git pull" to stop the user when the working tree has changes is useful in other places. Let's move it into a more prominent (and into an actually reusable) spot: wt-status.[ch]. Signed-off-by: Johannes Schindelin --- builtin/pull.c | 77

[PATCH v4 2/6] pull: make code more similar to the shell script again

When converting the pull command to a builtin, the require_clean_work_tree() function was renamed and the pull-specific parts hard-coded. This makes it impossible to reuse the code, so let's modify the code to make it more similar to the original shell script again. Note: when the hint "Please

[PATCH v4 4/6] wt-status: export also the has_un{staged,committed}_changes() functions

They will be used in the upcoming rebase helper. Signed-off-by: Johannes Schindelin --- wt-status.c | 4 ++-- wt-status.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wt-status.c b/wt-status.c index 89475f1..8fe7d0a 100644 ---

Re: What's cooking in git.git (Oct 2016, #02; Thu, 6)

Kevin Daudt writes: > Just wondering why the topic "kd/mailinfo-quoted-string (2016-09-28) 2 > commits" is not listed anymore. Previous what's cooking said it was > merged to "next". Thanks for your contribution. The topic was listed as graduated to 'master' in issue #1 of this

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Am 07.10.2016 um 14:27 schrieb Duy Nguyen: On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin wrote: Hi Junio, On Thu, 6 Oct 2016, Junio C Hamano wrote: Nguyễn Thái Ngọc Duy writes: Throwing something at the mailing list to see if anybody

Re: [PATCH v2 1/3] serialize collection of changed submodules

On Fri, Oct 7, 2016 at 8:06 AM, Heiko Voigt wrote: > To check whether a submodule needs to be pushed we need to collect all > changed submodules. Lets collect them first and then execute the > possibly expensive test whether certain revisions are already pushed > only once per

Re: [PATCH 3/4] mergetool: honor diff.orderFile

Am 07.10.2016 um 01:47 schrieb David Aguilar: @@ -606,4 +606,37 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT git reset --hard master >/dev/null 2>&1 ' +test_expect_success 'diff.orderFile configuration is honored' ' + test_config

Re: "Purposes, Concepts,Misfits, and a Redesign of Git" (a research paper)

On Fri, 30 Sep 2016 19:14:13 +0300 Konstantin Khomoutov wrote: > The "It Will Never Work in Theory" blog has just posted a summary of a > study which tried to identify shortcomings in the design of Git. > > In the hope it might be interesting, I post this summary here. >

Re: [PATCH 4/4] mergetool: honor -O

Am 07.10.2016 um 01:47 schrieb David Aguilar: diff --git a/git-mergetool.sh b/git-mergetool.sh index 65696d8..9dca58b 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt]

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Hi Matthieu, On Fri, 7 Oct 2016, Matthieu Moy wrote: > Duy Nguyen writes: > > > On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin > > wrote: > >> Hi Junio, > >> > >> On Thu, 6 Oct 2016, Junio C Hamano wrote: > >> > >>> Nguyễn Thái Ngọc Duy

Re: Systems with old regex system headers/libraries don't pick up git's compat/regex header file

On Fri, Oct 07, 2016 at 04:45:08PM +0100, Richard Lloyd wrote: > On 06/10/16 20:11, Jeff King wrote: > > Junio mentioned the NO_REGEX knob in the Makefile. If that works for > > you, the next step is probably to add a line to the HP-UX section of > > config.mak.uname, so that it just works out of

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Hi Duy, On Fri, 7 Oct 2016, Duy Nguyen wrote: > On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin > wrote: > > > > On Thu, 6 Oct 2016, Junio C Hamano wrote: > > > >> Nguyễn Thái Ngọc Duy writes: > >> > >> > Throwing something at the mailing

[PATCH v4 5/6] wt-status: teach has_{unstaged,uncommitted}_changes() about submodules

Sometimes we are *actually* interested in those changes... For example when an interactive rebase wants to continue with a staged submodule update. Signed-off-by: Johannes Schindelin --- builtin/pull.c | 2 +- wt-status.c| 16 +--- wt-status.h|

[PATCH v4 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

This is the 5th last patch series of my work to accelerate interactive rebases in particular on Windows. Basically, all it does is to make reusable some functions that were ported over from git-pull.sh but made private to builtin/pull.c. Changes since v3: - reworded 3/5's commit message

[PATCH v4 6/6] wt-status: begin error messages with lower-case

The previous code still followed the old git-pull.sh code which did not adhere to our new convention. Signed-off-by: Johannes Schindelin --- wt-status.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wt-status.c b/wt-status.c index

Re: Systems with old regex system headers/libraries don't pick up git's compat/regex header file

On 06/10/16 20:11, Jeff King wrote: Junio mentioned the NO_REGEX knob in the Makefile. If that works for you, the next step is probably to add a line to the HP-UX section of config.mak.uname, so that it just works out of the box. This doesn't work because the check in git-compat-util.h only

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Fri, Oct 07, 2016 at 04:11:34PM +0200, Johannes Schindelin wrote: > Possibly a better idea would be to use *another* special symbol, one that > makes intuitive sense as a modifier, such as: > > [alias] > # This works as before > xyz = !pwd > #

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Hi Kuba, On Fri, 7 Oct 2016, Jakub Narębski wrote: > W dniu 07.10.2016 o 13:20, Johannes Schindelin pisze: > > On Thu, 6 Oct 2016, Junio C Hamano wrote: > >> Nguyễn Thái Ngọc Duy writes: > >> > >>> Throwing something at the mailing list to see if anybody is > >>> interested.

[PATCH v2 2/3] serialize collection of refs that contain submodule changes

We are iterating over each pushed ref and want to check whether it contains changes to submodules. Instead of immediately checking each ref lets first collect them and then do the check for all of them in one revision walk. Signed-off-by: Heiko Voigt --- submodule.c | 36

[PATCH v2 1/3] serialize collection of changed submodules

To check whether a submodule needs to be pushed we need to collect all changed submodules. Lets collect them first and then execute the possibly expensive test whether certain revisions are already pushed only once per submodule. There is further potential for optimization since we can assemble

[PATCH v2 3/3] batch check whether submodule needs pushing into one call

We run a command for each sha1 change in a submodule. This is unnecessary since we can simply batch all sha1's we want to check into one command. Lets do it so we can speedup the check when many submodule changes are in need of checking. Signed-off-by: Heiko Voigt ---

[PATCH v2 0/3] Speedup finding of unpushed submodules

You can find the first iteration of this series as part of this thread: http://public-inbox.org/git/%3C20160914173124.GA7613@sandbox%3E/ All mentioned issues should be fixed. I dropped the last patch which was the cause of the broken tests. This should optimize every part of this test to a nice

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

W dniu 07.10.2016 o 16:19, Johannes Schindelin pisze: > On Fri, 7 Oct 2016, Jakub Narębski wrote: >> Note that we would have to teach git completion about new syntax; >> or new configuration variable if we go that route. > > Why would we? Git's completion does not expand aliases, it only

Re: [PATCH v7 0/4] recursive support for ls-files

On Fri, Oct 7, 2016 at 11:18 AM, Brandon Williams wrote: > Few minor fixes pointed out Stefan Nit: This is not very informative, so you could provide an "interdiff" to the last patch, (see https://github.com/trast/tbdiff for a sophisticated tool, I usually do a git diff

Re: [PATCH v2 3/3] batch check whether submodule needs pushing into one call

On Fri, Oct 7, 2016 at 8:06 AM, Heiko Voigt wrote: > We run a command for each sha1 change in a submodule. This is > unnecessary since we can simply batch all sha1's we want to check into > one command. Lets do it so we can speedup the check when many submodule > changes are in

Re: [PATCH v7 0/4] recursive support for ls-files

On Fri, Oct 7, 2016 at 11:34 AM, Stefan Beller wrote: > On Fri, Oct 7, 2016 at 11:18 AM, Brandon Williams wrote: >> Few minor fixes pointed out Stefan > The series itself looks good though. :) Thanks, Stefan

Re: "Purposes, Concepts,Misfits, and a Redesign of Git" (a research paper)

W dniu 07.10.2016 o 19:52, Konstantin Khomoutov pisze: > On Fri, 30 Sep 2016 19:14:13 +0300 > Konstantin Khomoutov wrote: > >> The "It Will Never Work in Theory" blog has just posted a summary of a >> study which tried to identify shortcomings in the design of Git. >> >> In

RE: Uninitialized submodules as symlinks

> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Friday, October 07, 2016 2:56 PM > To: David Turner > Cc: git@vger.kernel.org > Subject: Re: Uninitialized submodules as symlinks > > On Fri, Oct 7, 2016 at 11:17 AM, David Turner

Re: [PATCH v7 0/4] recursive support for ls-files

On 10/07, Stefan Beller wrote: > On Fri, Oct 7, 2016 at 11:34 AM, Stefan Beller wrote: > > On Fri, Oct 7, 2016 at 11:18 AM, Brandon Williams wrote: > >> Few minor fixes pointed out Stefan > > > > The series itself looks good though. :) > > Thanks, >

[PATCH] remote.c: free previous results when looking for a ref match

Signed-off-by: Stefan Beller --- remote.c | 4 1 file changed, 4 insertions(+) diff --git a/remote.c b/remote.c index ad6c542..5f9afb4 100644 --- a/remote.c +++ b/remote.c @@ -833,6 +833,8 @@ static int match_name_with_pattern(const char *key, const char *name,

[PATCH v3 1/4] mergetool: add copyright

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 @@

[PATCH v3 2/4] mergetool: move main program flow into a main() function

Make it easier to follow the program's flow by isolating all logic into functions. Isolate the main execution code path into a single unit instead of having prompt_after_failed_merge() interrupt it partyway through. The use of a main() function is borrowing a convention from C, Python, Perl, and

[PATCH v3 3/4] mergetool: honor diff.orderFile

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

[PATCH v3 4/4] mergetool: honor -O

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

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Fri, Oct 7, 2016 at 10:55 PM, Jakub Narębski wrote: > W dniu 07.10.2016 o 16:19, Johannes Schindelin pisze: >> On Fri, 7 Oct 2016, Jakub Narębski wrote: > >>> Note that we would have to teach git completion about new syntax; >>> or new configuration variable if we go that

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Hi Junio, On Thu, 6 Oct 2016, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > > > Throwing something at the mailing list to see if anybody is > > interested. > > > > Current '!' aliases move cwd to $GIT_WORK_TREE first, which could make > > handling path arguments

Re: Regression: git no longer works with musl libc's regex impl

W dniu 07.10.2016 o 00:42, Ramsay Jones pisze: > On 06/10/16 20:18, Ævar Arnfjörð Bjarmason wrote: [...] >> But just to clarify, does anyone have any objection to making our >> configure.ac compile a C program to check for this sort of thing? >> Because that seems like the easiest solution to

Re: [PATCH 6/6] Documentation/git-merge.txt: get rid of irrelevant references to git-pull

Junio C Hamano writes: > Sergey Organov writes: > >> Ah, I now see. I tried to keep the text intact as much as possible, and >> only split it into description and a note. Well, how about this then: > > Much better than your earlier patch, but I am not sure

[PATCH v2 2/4] mergetool: move main program flow into a main() function

Make it easier to follow the program's flow by isolating all logic into functions. Isolate the main execution code path into a single unit instead of having prompt_after_failed_merge() interrupt it partyway through. The use of a main() function is borrowing a convention from C, Python, Perl, and

Re: [PATCH 1/2] submodule add: extend force flag to add existing repos

On Thu, Oct 06, 2016 at 01:11:20PM -0700, Junio C Hamano wrote: > Stefan Beller writes: > > > Currently the force flag in `git submodule add` takes care of possibly > > ignored files or when a name collision occurs. > > > > However there is another situation where submodule

Re: [PATCH 5/6] Documentation/git-merge.txt: improve short description in DESCRIPTION

Junio C Hamano writes: > Sergey Organov writes: > Last, if "reference" is not good enough and we get to internals anyway, why not say SHA1 then? >>> >>> Because that is still colloquial? I think s/name/object name/ is a >>> sensible change, but

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin wrote: > Hi Junio, > > On Thu, 6 Oct 2016, Junio C Hamano wrote: > >> Nguyễn Thái Ngọc Duy writes: >> >> > Throwing something at the mailing list to see if anybody is >> > interested. >> > >> >

Re: [PATCHv3 1/2] push: change submodule default to check when submodules exist

On Thu, Oct 06, 2016 at 10:20:16AM -0700, Stefan Beller wrote: > On Thu, Oct 6, 2016 at 2:23 AM, Heiko Voigt wrote: > > On Wed, Oct 05, 2016 at 03:53:25PM +0200, Heiko Voigt wrote: > >> On Tue, Oct 04, 2016 at 02:03:58PM -0700, Stefan Beller wrote: > >> > Jeff, > >> > thanks

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Fri, Oct 7, 2016 at 7:47 PM, Matthieu Moy wrote: > Duy Nguyen writes: > >> On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin >> wrote: >>> Hi Junio, >>> >>> On Thu, 6 Oct 2016, Junio C Hamano wrote: >>>

Re: [PATCH 1/3] Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"

On Fri, Oct 7, 2016 at 2:15 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Tue, Oct 4, 2016 at 11:15 PM, Junio C Hamano wrote: >>> Duy Nguyen writes: >>> We don't use it internally _yet_. I need to go

[PATCH v4 4/4] mergetool: honor -O

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.

[PATCH] clean up confusing suggestion for commit references

The description for referencing commits looks as if it is contradicting the example, since it is itself enclosed in double quotes. Lets use single quotes around the description and include the double quotes in the description so it matches the example. --- Sorry for opening this up again but I