Re: ``git clean -xdf'' and ``make clean''

On Tue, Feb 7, 2017 at 7:07 AM, Cornelius Weig wrote: > On 02/07/2017 03:17 PM, Hongyi Zhao wrote: >> Hi all, >> >> In order to delete all of the last build stuff, does the following two >> methods equivalent or not? >> >> ``git clean -xdf'' and ``make clean'' > > No,

Re: Request re git status

On Tue, Feb 7, 2017 at 6:54 AM, Samuel Lijin wrote: > On Mon, Feb 6, 2017 at 6:45 PM, Phil Hord wrote: >> On Mon, Feb 6, 2017 at 3:36 PM Ron Pero wrote: >>> I almost got bit by git: I knew there were changes on the remote >>> server,

Re: What's cooking in git.git (Feb 2017, #02; Mon, 6)

On Mon, Feb 6, 2017 at 4:24 PM, SZEDER Gábor wrote: >> * sg/completion-refs-speedup (2017-02-06) 13 commits >> - squash! completion: fill COMPREPLY directly when completing refs >> - completion: fill COMPREPLY directly when completing refs >> - completion: list only

Re: [PATCH 00/12] completion: speed up refs completion

On Mon, Feb 6, 2017 at 11:36 AM, SZEDER Gábor <szeder@gmail.com> wrote: > On Mon, Feb 6, 2017 at 7:31 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Fri, Feb 3, 2017 at 7:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >>> I haven't had a chance

Re: [PATCH 00/12] completion: speed up refs completion

On Fri, Feb 3, 2017 at 7:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > I haven't had a chance to further investigate, but I tried this series > out (from your github) and it appears that this series (or the > previous series for __gitdir work) breaks "git log" re

Re: [PATCH 1/4] git-prompt.sh: add submodule indicator

On Sun, Feb 5, 2017 at 8:23 PM, Stefan Beller wrote: > > (unrelated side note:) > At GitMerge facebook presented their improvements on mercurial > and one of the things was "hg absorb". It would take the dirty hunks/lines > of the working tree and amend them into the "stack of

Re: [PATCH/TOY] Shortcuts to quickly refer to a commit name with keyboard

On Sun, Feb 5, 2017 at 2:39 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Sat, Jan 21, 2017 at 2:16 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> I would be interested in the code for this.. I'm curious if I can >> adapt it to my use of tmux. > > I stum

Re: [PATCH] Remove --no-gui option from difftool usage string

On Fri, Feb 3, 2017 at 6:56 PM, Denton Liu wrote: > The --no-gui option not documented in the manpage, nor is it actually > used in the source code. This change removes it from the usage help > that's printed. > > Signed-off-by: Denton Liu > --- >

Re: [PATCH 00/12] completion: speed up refs completion

On Thu, Feb 2, 2017 at 8:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Thu, Feb 2, 2017 at 6:53 PM, SZEDER Gábor <szeder@gmail.com> wrote: >> This series speeds up refs completion for large number of refs, partly >> by giving up disambiguating ambiguou

[PATCH v2] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.kel...@gmail.com> It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git

Re: [PATCH] reset: add an example of how to split a commit into two

On Fri, Feb 3, 2017 at 10:59 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >>> +$ git reset -p HEAD^<1> >> >> For good practice, perhaps put "git diff --cached HEAD^" before "git commit". >> >> I tend to avoid "reset -p" and

Re: [PATCH 00/12] completion: speed up refs completion

On Thu, Feb 2, 2017 at 6:53 PM, SZEDER Gábor wrote: > This series speeds up refs completion for large number of refs, partly > by giving up disambiguating ambiguous refs (patch 6) and partly by > eliminating most of the shell processing between 'git for-each-ref' > and

[PATCH] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.kel...@gmail.com> It is sometimes useful to break a commit into parts to more logically show how the code changes. There are many possible ways to achieve this result, but one simple and powerful one is to use git reset -p. Add an example to the documentation s

Re: [PATCH] color_parse_mem: allow empty color spec

On Tue, Jan 31, 2017 at 4:21 PM, Jeff King wrote: > On Tue, Jan 31, 2017 at 02:45:40PM -0800, Junio C Hamano wrote: > >> * nd/log-graph-configurable-colors (2017-01-23) 3 commits >> (merged to 'next' on 2017-01-23 at c369982ad8) >> + log --graph: customize the graph lines with

Re: [PATCH] Completion: Add support for --submodule=diff

On Sun, Dec 4, 2016 at 6:41 AM, wrote: > From: Peter Law > > Teach git-completion.bash about the 'diff' option to 'git diff > --submodule=', which was added in Git 2.11. > > Signed-off-by: Peter Law > --- >

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 6:32 PM, Junio C Hamano wrote: > Where did you get that "unset" from? If that is this paragraph in > Documentation/gitattributes.txt: > Ok so that whole section of documentation is very confusing to me. Maybe it could be improved for more readability.

Re: merge maintaining history

On Wed, Jan 25, 2017 at 4:31 PM, David J. Bakeman wrote: > OK so what I've done so far is to clone the original then I added > another remote connected to new repo. Then I did git merge newrepo. It > did a bunch of stuff that flashed by really fast and then reported a >

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 3:57 PM, Hilco Wijbenga <hilco.wijbe...@gmail.com> wrote: > On 25 January 2017 at 15:46, Junio C Hamano <gits...@pobox.com> wrote: >> Jacob Keller <jacob.kel...@gmail.com> writes: >> >>>> Mmm, that sounds complex. The "my-

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 2:51 PM, Hilco Wijbenga <hilco.wijbe...@gmail.com> wrote: > On 25 January 2017 at 14:24, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga >> <hilco.wijbe...@gmail.com> wrote: >>> H

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga wrote: > How can I force Git to not assume my change to the first line is "redundant"? > My guess is that you probably want a custom merge driver for your file types. That's where I would look initially. Thanks, Jake >

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

On Wed, Jan 25, 2017 at 1:27 PM, Jeff King wrote: > On Wed, Jan 25, 2017 at 03:57:18PM -0500, Jeff King wrote: > >> IOW, the ref-selector options build up until a group option is given, >> which acts on the built-up options (over that group) and then resets the >> built-up options.

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

On Wed, Jan 25, 2017 at 4:50 AM, Nguyễn Thái Ngọc Duy wrote: > Behavior change: "--exclude --blah --remotes" will not exclude remote > branches any more. Only "--exclude --remotes" does. > > This is because --exclude is going to have a new friend --decorate-reflog > who haves

Re: [PATCH] log: new option decorate reflog of remote refs

On Fri, Jan 20, 2017 at 6:30 AM, Jeff King wrote: >> Imposing order between options could cause confusion, I think, if you >> remove --decorate-reflog leaving --remotes on by accident, now you get >> --remotes with a new meaning. We could go with something like >>

Re: [PATCH/TOY] Shortcuts to quickly refer to a commit name with keyboard

On Fri, Jan 20, 2017 at 8:09 AM, Jeff King wrote: > On Fri, Jan 20, 2017 at 05:22:49PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> OK This patch is horrible. Though the idea is cool and I've found it >> very useful. So here it is. Perhaps the idea may be revised a bit >> that's more

Re: [RFC for GIT] pull-request: add praise to people doing QA

On Thu, Jan 19, 2017 at 4:06 PM, Joe Perches wrote:>> This sounds interesting to me! When I have some more time to take a >> look at this i might see if I can revive it. > > Can the terminology please be standardized to what > was once called bylines? > >

Re: [PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

On Thu, Jan 19, 2017 at 1:06 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git name-rev to take multiple --refs stored as a string

Re: [RFC for GIT] pull-request: add praise to people doing QA

On Thu, Jan 19, 2017 at 1:20 PM, Jeff King wrote: > On Thu, Jan 19, 2017 at 09:43:45PM +0100, Wolfram Sang wrote: > >> > As to the implementation, I am wondering if we can make this somehow >> > work well with the "trailers" code we already have, instead of >> > inventing yet

Re: [PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

On Thu, Jan 19, 2017 at 1:06 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git name-rev to take multiple --refs stored as a string

[PATCH v4 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend git-name-rev to support excluding refs which match shell patterns using --exclude. These patterns can be used to limit the scope of refs by excluding any ref that matches one of the --exclude patterns. A ref will only be used for namin

[PATCH v4 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally, teach these commands to also accept negative patterns to exclude any refs which match. The pattern lists for positive and negative pa

[PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take multiple --refs stored as a string list of patterns. The list of patterns will be matched inclusively, and each ref only needs to match one pattern to be included. A ref will only be excluded if it does not mat

[PATCH v4 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

[PATCH v4 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v4 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

On Wed, Jan 18, 2017 at 1:56 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> Yes this makes sense. I'm still looking at whether the alternative >> implementation suggested based on the git-log style would make more &

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

On Wed, Jan 18, 2017 at 12:11 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Extend name-rev further to support matching refs by adding `--exclu

Re: [PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

On Wed, Jan 18, 2017 at 12:04 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git name-rev to take a string list of patterns from --refs ins

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Wed, Jan 18, 2017 at 4:44 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Tue, 17 Jan 2017, Jacob Keller wrote: > >> On Fri, Jan 13, 2017 at 1:31 PM, Johannes Sixt <j...@kdbg.org> wrote: >> > Am 13.01.2017 um 07:57 schrieb J

Re: [PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

On Wed, Jan 18, 2017 at 11:45 AM, Junio C Hamano wrote: > > I do not know if it is clear enough that 'option' in the last > sentence is a placeholder. I then wondered if spelling it as > `--no-` would make it a bit clearer, but that is ugly. > To be fair, this is exactly how

Re: [PATCH v3 0/5] extend git-describe pattern matching

On Wed, Jan 18, 2017 at 12:18 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> ** v3 fixes a minor typo in one of the test cases, so please ignore v

[PATCH v2 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally, teach these commands to also accept negative patterns to exclude any refs which match. The pattern lists for positive and negative pa

[PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend name-rev further to support matching refs by adding `--exclude` patterns. These patterns will limit the scope of refs by excluding any ref that matches at least one exclude pattern. Checking the exclude refs shall happen first, before ch

[PATCH v3 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take a string list of patterns from --refs instead of only a single pattern. The list of patterns will be matched inclusively, such that a ref only needs to match one pattern to be included. If a ref will only be ex

[PATCH v3 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

[PATCH v3 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> ** v3 fixes a minor typo in one of the test cases, so please ignore v2 I left the interdiff as between v1 and v3 instead of v2 ** Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally,

[PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

[PATCH v2 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend name-rev further to support matching refs by adding `--exclude` patterns. These patterns will limit the scope of refs by excluding any ref that matches at least one exclude pattern. Checking the exclude refs shall happen first, before ch

[PATCH v2 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take a string list of patterns from --refs instead of only a single pattern. The list of patterns will be matched inclusively, such that a ref only needs to match one pattern to be included. If a ref will only be ex

[PATCH v2 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v2 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

[PATCH v2 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Fri, Jan 13, 2017 at 1:31 PM, Johannes Sixt <j...@kdbg.org> wrote: > Am 13.01.2017 um 07:57 schrieb Jacob Keller: >> >> On Thu, Jan 12, 2017 at 10:43 PM, Johannes Sixt <j...@kdbg.org> wrote: >>> >>> When you write >>> >>> gi

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

On Mon, Jan 16, 2017 at 2:00 PM, Jeff King wrote: > On Mon, Jan 16, 2017 at 06:06:35PM +0100, Johannes Schindelin wrote: > >> > And I think that would apply to any input parameter we show via >> > error(), etc, if it is connected to a newline (ideally we would >> >

Re: Different merges from translation perspective

On Sun, Jan 15, 2017 at 8:41 PM, Alexander Shopov wrote: > Hi all, > What is the difference between simple, fast forward, automatic and > trivial merge? > I am updating the translation and the only thing I am sure about is > that these four are not octopus merges, > Fast

Re: [PATCH v3 01/38] sequencer: avoid unnecessary curly braces

On Sat, Jan 14, 2017 at 10:05 AM, Jeff King wrote: > On Sat, Jan 14, 2017 at 06:57:13PM +0100, Johannes Schindelin wrote: > >> On Thu, 12 Jan 2017, Junio C Hamano wrote: >> >> > Johannes Schindelin writes: >> > >> > > >> > > - if (!commit->parents) { >>

Re: [RFC for GIT] pull-request: add praise to people doing QA

On Sun, Jan 15, 2017 at 4:35 PM, Junio C Hamano wrote: > As to the implementation, I am wondering if we can make this somehow > work well with the "trailers" code we already have, instead of > inventing yet another parser of trailers. > > In its current shape,

Re: [RFC] stash --continue

On Sun, Jan 15, 2017 at 3:56 PM, Stephan Beyer wrote: > Hi, > > a git-newbie-ish co-worker uses git-stash sometimes. Last time he used > "git stash pop", he got into a merge conflict. After he resolved the > conflict, he did not know what to do to get the repository into the >

Re: merge maintaining history

On Fri, Jan 13, 2017 at 6:01 PM, David J. Bakeman wrote: > History > > git cloned a remote repository and made many changes pushing them all to > said repository over many months. > > The powers that be then required me to move project to new repository > server did so by

Re: [PATCH v10 19/20] branch: use ref-filter printing APIs

On Sat, Jan 14, 2017 at 2:01 AM, Karthik Nayak <karthik@gmail.com> wrote: > Hello, > > On Thu, Jan 12, 2017 at 5:17 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Tue, Jan 10, 2017 at 12:49 AM, Karthik Nayak <karthik@gmail.com> >> wrote: >

Re: [PATCH 0/5] extend git-describe pattern matching

On Fri, Jan 13, 2017 at 10:48 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git describe and git name-rev the ability to match multiple &g

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Thu, Jan 12, 2017 at 10:43 PM, Johannes Sixt <j...@kdbg.org> wrote: > Am 13.01.2017 um 01:59 schrieb Jacob Keller: >> >> I think that --exclude makes sense, but the current implementation >> does not differentiate ordering, since both are merely accumulated >> i

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Thu, Jan 12, 2017 at 5:45 AM, Johannes Sixt <j...@kdbg.org> wrote: > Am 12.01.2017 um 01:17 schrieb Jacob Keller: >> >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git-describe the `--discard` option which will allow specifying >&g

Re: [PATCH 3/5] name-rev: add support to discard refs by pattern match

On Thu, Jan 12, 2017 at 1:57 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Extend name-rev further to support matching refs b

Re: [PATCH 2/5] name-rev: extend --refs to accept multiple patterns

On Thu, Jan 12, 2017 at 1:56 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> diff --git a/t/t6007-rev-list-cherry-pick-file.sh >> b/t/t6007-rev-list-cherry-pick-file.sh >> index 1408b608

Re: [PATCH 1/5] doc: add documentation for OPT_STRING_LIST

On Thu, Jan 12, 2017 at 1:47 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> diff --git a/Documentation/technical/api-parse-options.txt >> b/Documentation/technical/api-parse-options.txt >&

[PATCH 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

[PATCH 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH 3/5] name-rev: add support to discard refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend name-rev further to support matching refs by adding `--discard` patterns. These patterns will limit the scope of refs by discarding any ref that matches at least one discard pattern. Checking the discard refs shall happen first, before ch

[PATCH 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--discard` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

[PATCH 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take a string list of patterns from --refs instead of only a single pattern. The list of patterns will be matched inclusively, such that a ref only needs to match one pattern to be included. If a ref will only be ex

[PATCH 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally, teach these commands to also accept negative patterns to discard any refs which match. The pattern lists for positive and negative pa

Re: [PATCH v10 19/20] branch: use ref-filter printing APIs

On Tue, Jan 10, 2017 at 12:49 AM, Karthik Nayak wrote: > diff --git a/builtin/branch.c b/builtin/branch.c > index 34cd61cd9..f293ee5b0 100644 > --- a/builtin/branch.c > +++ b/builtin/branch.c > @@ -37,11 +37,11 @@ static unsigned char head_sha1[20]; > static int

Re: git branch -D doesn't work with deleted worktree

On Mon, Jan 9, 2017 at 2:07 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Mon, Jan 9, 2017 at 10:44 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Why not just update the documentation to be "when you are done with a >> work tree you can delete it

Re: git branch -D doesn't work with deleted worktree

On Fri, Jan 6, 2017 at 2:05 AM, Duy Nguyen wrote: > On Thu, Jan 5, 2017 at 9:02 PM, Stefan Beller wrote: >> On Thu, Jan 5, 2017 at 2:06 AM, Roland Illig wrote: >>> Git 2.11.0 gives a wrong error message after the following commands:

Re: [PATCH 0/3] fix ^C killing pager when running alias

On Sat, Jan 7, 2017 at 3:26 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Fri, Jan 6, 2017 at 5:14 PM, Jeff King <p...@peff.net> wrote: >> On Fri, Jan 06, 2017 at 06:20:42PM -0500, Jeff King wrote: >> >>> > In general, I think it is wrong to

Re: [PATCH 0/3] fix ^C killing pager when running alias

On Fri, Jan 6, 2017 at 5:14 PM, Jeff King wrote: > On Fri, Jan 06, 2017 at 06:20:42PM -0500, Jeff King wrote: > >> > In general, I think it is wrong to wait for child processes when a signal >> > was received. After all, it is the purpose of a (deadly) signal to have the >> >

Re: [PATCH v4 0/5] road to reentrant real_path

On Wed, Jan 4, 2017 at 10:22 AM, Stefan Beller wrote: > On Wed, Jan 4, 2017 at 10:13 AM, Brandon Williams wrote: >> On 01/04, Jeff King wrote: >>> On Wed, Jan 04, 2017 at 07:56:02AM +0100, Torsten Bögershausen wrote: >>> >>> > On 04.01.17 01:48, Jeff King

Re: builtin difftool parsing issue

On Tue, Jan 3, 2017 at 10:47 AM, Stefan Beller wrote: > On Mon, Jan 2, 2017 at 11:05 AM, Paul Sbarra wrote: >>> I would have expected `git difftool --submodule=diff ...` to work... What >>> are the problems? >> >> The docs for difftool state... >> "git

Re: [PATCH v4 4/5] real_path: have callers use real_pathdup and strbuf_realpath

On Tue, Jan 3, 2017 at 11:09 AM, Brandon Williams wrote: > Migrate callers of real_path() who duplicate the retern value to use > real_pathdup or strbuf_realpath. Nit: s/retern/return

Re: [PATCH v3 00/23] Delete directories left empty after ref deletion

On Mon, Jan 2, 2017 at 10:14 AM, Michael Haggerty <mhag...@alum.mit.edu> wrote: > On 01/02/2017 05:19 AM, Jeff King wrote: >> On Sun, Jan 01, 2017 at 12:36:11PM -0800, Jacob Keller wrote: >> >>> But how likely is it to end up with differing binaries running on

Re: [PATCH v3 00/23] Delete directories left empty after ref deletion

On Sun, Jan 1, 2017 at 4:43 AM, Philip Oakley <philipoak...@iee.org> wrote: > From: "Jacob Keller" <jacob.kel...@gmail.com> >> I do have one comment regarding this series. Is it ever possible for >> an older version of git to be running a process while a new v

Re: [PATCH v3 00/23] Delete directories left empty after ref deletion

On Sun, Jan 1, 2017 at 1:24 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Sat, Dec 31, 2016 at 6:32 PM, Junio C Hamano <gits...@pobox.com> wrote: >> Jeff King <p...@peff.net> writes: >> >>> On Sat, Dec 31, 2016 at 04:12:40AM +0100, Michael

Re: [PATCH v3 00/23] Delete directories left empty after ref deletion

On Sat, Dec 31, 2016 at 6:32 PM, Junio C Hamano wrote: > Jeff King writes: > >> On Sat, Dec 31, 2016 at 04:12:40AM +0100, Michael Haggerty wrote: >> >>> This is a re-roll of an old patch series. v1 [1] got some feedback, >>> which I think was all addressed in v2

Re: [PATCH] am: add am.signoff add config variable

On December 29, 2016 12:47:01 AM PST, Eric Wong wrote: >Eduardo Habkost wrote: >> git-am has options to enable --message-id and --3way by default, >> but no option to enable --signoff by default. Add a "am.signoff" >> config option. > >I'm not sure this is a

Re: HowTo distribute a hook with the reposity.

On Tue, Dec 27, 2016 at 10:08 PM, Jeff King wrote: > >https://github.com/Autodesk/enterprise-config-for-git > > (with the disclaimer that I've never used it myself, so I have no > idea how good it is). > > I think you probably know all that, Jake, but I am laying

Re: HowTo distribute a hook with the reposity.

On Tue, Dec 27, 2016 at 5:34 PM, John P. Hartmann wrote: > I would like a hook in .got/hooks to be made available to all who clone or > pull a particular project. I'd also like the hook to be under git control > (changes committed ). I added a hook, but git status does not

Re: [PATCH v9 15/20] ref-filter: modify the 'lstrip=' option to work with negative ''

On Tue, Dec 27, 2016 at 1:11 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> Currently the 'lstrip=' option only takes a positive value '' >> and strips '' slash-separated path components from the left. Modify >> the 'lstrip' option to also take a

Re: [PATCH] diff: prefer indent heuristic over compaction heuristic

On Fri, Dec 23, 2016 at 2:21 PM, Jeff King wrote: > On Fri, Dec 23, 2016 at 01:17:03PM -0800, Junio C Hamano wrote: > >> Junio C Hamano writes: >> >> > I guess both you and Michael are in favor of just removing compaction >> > variant without any renames, so let

Re: [RFC/PATCH] add diffstat information to rebase

On Thu, Dec 22, 2016 at 2:37 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> $ git rebase -i HEAD^^ >> >> pick 2eaa3f532c Third batch for 2.12 >> # Documentation/RelNotes/2.12.0.txt | 40 >> +++ >>

Re: [PATCH] diff: prefer indent heuristic over compaction heuristic

On Thu, Dec 22, 2016 at 11:22 PM, Jeff King <p...@peff.net> wrote: > On Thu, Dec 22, 2016 at 01:12:12PM -0800, Junio C Hamano wrote: > >> Jacob Keller <jacob.kel...@gmail.com> writes: >> >> > I don't think we have too many config options that interact in th

Re: Making it possible to do “git push origin” instead of “git push origin ”, without having to one-time prepare each branch for it

On Thu, Dec 22, 2016 at 1:14 PM, Stefan Monov wrote: > Hi. > > I'd like to use just: > > git push > > or at most: > > git push origin > > rather than having to first check which is the active branch with `git > branch --list`, then type: > > git push origin > > At

Re: [PATCH] diff: prefer indent heuristic over compaction heuristic

On Thu, Dec 22, 2016 at 1:12 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> I don't think we have too many config options that interact in this >> way, so I understand that "last writing of a parti

Re: Allow "git shortlog" to group by committer information

On Tue, Dec 20, 2016 at 7:22 PM, Jeff King wrote: > On Tue, Dec 20, 2016 at 10:35:36AM -0800, Junio C Hamano wrote: > >> -- >8 -- >> Subject: SQUASH??? >> >> Make sure the test does not depend on the result of the previous >> tests; with MINGW prerequisite satisfied, a "reset to

Re: [PATCH v2 1/5] doc: add documentation for OPT_STRING_LIST

On December 17, 2016 3:56:19 AM PST, Philip Oakley <philipoak...@iee.org> wrote: >From: "Jacob Keller" <jacob.e.kel...@intel.com> >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST help

Re: [PATCH] diff: prefer indent heuristic over compaction heuristic

On Fri, Dec 16, 2016 at 5:30 PM, Junio C Hamano wrote: > Although I do not think we should spend too much braincycles on this > one (we should rather just removing the older one soonish), I think > this patch is going in a wrong direction. I agree that "the last > one wins" is

[PATCH v2 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--discard` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

[PATCH v2 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v2 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take a string list of patterns from --refs instead of only a single pattern. The list of patterns will be matched inclusively, such that a ref only needs to match one pattern to be included. If a ref will only be ex

[PATCH v2 3/5] name-rev: add support to discard refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend name-rev further to support matching refs by adding `--discard` patterns. These patterns will limit the scope of refs by discarding any ref that matches at least one discard pattern. Checking the discard refs shall happen first, before ch

<    1   2   3   4   5   6   7   8   9   10   >