Re: [PATCH v1] convert: add support for 'encoding' attribute

Am 12.12.2017 um 01:59 schrieb Junio C Hamano: Stepping back a bit, what does this thing do you are introducing? And what does the other thing do that J6t is using, that would get confused with this new one? What does the other one do? "Declare that the contents of this path is in this

Re: [PATCH v1] convert: add support for 'encoding' attribute

Am 12.12.2017 um 00:42 schrieb Lars Schneider: BTW: I am curios, can you share what encoding you use? My main use case is UTF-16 and I was surprised that I haven't found a single public repo on github.com with "encoding=utf-16" Shift-JIS and CP1252. These are used for Windows resource files

Dear Friend,

Dear Friend, I am the head of Accounts and Audit Department of Bank of Africa, Ouagadougou . I decided to contact you after a careful thought that you may be capable of handling this business transaction which I explained below; In my department, I discovered an abandoned sum of $13.5m US dollars

[PATCH] diffcore: add a filter to find a specific blob

Sometimes users are given a hash of an object and they want to identify it further (ex.: Use verify-pack to find the largest blobs, but what are these? or [1]) One might be tempted to extend git-describe to also work with blobs, such that `git describe ` gives a description as ':'. This was

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

Jonathan Nieder writes: > I think the documentation > > ~/.gitconfig > User-specific configuration file. Also called "global" > configuration file. > > should be clarified --- e.g. it could say > > $XDG_CONFIG_HOME/git/config >

Re: [PATCH v1] convert: add support for 'encoding' attribute

Lars Schneider writes: > I contemplated: > - "enc" or "encode" because "eol" and "ident" use abbreviations, too > (enc could be confused with encryption. plus, a user might ask > what is the difference between "enc" and "encoding" attribute :-) > - "wte",

Re: [PATCH] clone: support 'clone --shared' from a worktree

On 12/11, Eric Sunshine wrote: > On Mon, Dec 11, 2017 at 7:18 PM, Brandon Williams wrote: > > On 12/11, Eric Sunshine wrote: > >> struct strbuf alt = STRBUF_INIT; > >> - strbuf_addf(, "%s/objects", src_repo); > >> + get_common_dir(,

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Mon, 11 Dec 2017, Jonathan Nieder wrote: > > Example to show that TFM outlines precedence and --global correctly: > > $> grep xdg .gitconfig .config/git/config > > .gitconfig:xdg-and-user = user > > .config/git/config: xdg = xdg > > .config/git/config: xdg-and-user = xdg > > $> git config

Re: [PATCH] clone: support 'clone --shared' from a worktree

On Mon, Dec 11, 2017 at 7:18 PM, Brandon Williams wrote: > On 12/11, Eric Sunshine wrote: >> struct strbuf alt = STRBUF_INIT; >> - strbuf_addf(, "%s/objects", src_repo); >> + get_common_dir(, src_repo); >> + strbuf_addstr(,

RE: [Proposed] Externalize man/html ref for quick-install-man and quick-install-html

Sorry about the response positioning... I can send you a pull request on github, if you want  -Original Message- From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf Of Junio C Hamano Sent: December 11, 2017 6:27 PM To: Randall S. Becker

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

On Mon, Dec 11, 2017 at 3:17 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> the information to what is shown. For example: >> >> $ ./git log --oneline --blobfind=v2.0.0:Makefile >> b2feb64309 Revert the whole "ask curl-config" topic for now >>

Re: [PATCH] clone: support 'clone --shared' from a worktree

On 12/11, Eric Sunshine wrote: > When worktree functionality was originally implemented, the possibility > of 'clone --local' from within a worktree was overlooked, with the > result that the location of the "objects" directory of the source > repository was computed incorrectly, thus the objects

Re: [PATCH] clone: support 'clone --shared' from a worktree

Eric Sunshine writes: > When worktree functionality was originally implemented, the possibility > of 'clone --local' from within a worktree was overlooked, with the > result that the location of the "objects" directory of the source > repository was computed incorrectly,

Re: [PATCH v1] convert: add support for 'encoding' attribute

On Mon, Dec 11, 2017 at 6:47 PM, Lars Schneider wrote: > On 11 Dec 2017, at 19:39, Eric Sunshine wrote: >> On Mon, Dec 11, 2017 at 10:50 AM, wrote: >>> From: Lars Schneider >>> >>> Git

Re: [PATCH v1] convert: add support for 'encoding' attribute

On 11 Dec 2017, at 19:39, Eric Sunshine wrote: > On Mon, Dec 11, 2017 at 10:50 AM, wrote: >> From: Lars Schneider >> >> Git and its tools (e.g. git diff) expect all text files in UTF-8 >> encoding. Git will

Re: [PATCH v5 0/9] sequencer: don't fork git commit

Phillip Wood writes: > From: Phillip Wood > > I've reworked the config handling since v4. It now stores the default > values in struct replay_opt rather than using global variables and > calls git_diff_basic_config(). Unfortunately I've not

Re: [PATCH v1] convert: add support for 'encoding' attribute

On 11 Dec 2017, at 21:47, Johannes Sixt wrote: > Am 11.12.2017 um 16:50 schrieb lars.schnei...@autodesk.com: >> From: Lars Schneider >> Git and its tools (e.g. git diff) expect all text files in UTF-8 >> encoding. Git will happily accept content in all

[PATCH 4/4] travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'

Commit 657343a60 (travis-ci: move Travis CI code into dedicated scripts, 2017-09-10) converted '.travis.yml's default 'before_install' scriptlet to the 'ci/install-dependencies.sh' script, and while doing so moved setting GIT_TEST_HTTPD=YesPlease for the 64-bit GCC and Clang Linux build jobs to

[PATCH 1/4] travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output

While the build logic was embedded in our '.travis.yml', Travis CI used to produce a nice trace log including all commands executed in those embedded scriptlets. Since 657343a60 (travis-ci: move Travis CI code into dedicated scripts, 2017-09-10), however, we only see the name of the dedicated

[PATCH 3/4] travis-ci: move setting environment variables to 'ci/lib-travisci.sh'

Our '.travis.yml's 'env.global' section sets a bunch of environment variables for all build jobs, though none of them actually affects all build jobs. It's convenient for us, and in most cases it works just fine, because irrelevant environment variables are simply ignored. However,

[PATCH 0/4] travis-ci: clean up setting environment variables

(Was: [PATCH] travis-ci: fix running P4 and Git LFS tests in Linux build jobs) On Wed, Nov 1, 2017 at 12:55 PM, SZEDER Gábor wrote: > However, after these > embedded scriptlets were moved into dedicated scripts executed in > separate shell processes, any variable set in one

[PATCH 2/4] travis-ci: introduce a $jobname variable for 'ci/*' scripts

A couple of 'ci/*' scripts are shared between different build jobs: 'ci/lib-travisci.sh', being a common library, is sourced from almost every script, while 'ci/install-dependencies.sh', 'ci/run-build.sh' and 'ci/run-tests.sh' are shared between the "regular" GCC and Clang Linux and OSX build

Re: [PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules

Ævar Arnfjörð Bjarmason writes: > I don't know what I was thinking when I wrote this, but this logic > should be fully robust, and I've confirmed that all tests pass > with/without an Error.pm installed globally. Thanks. Will queue and drop the revert from 'pu'.

Re: [Proposed] Externalize man/html ref for quick-install-man and quick-install-html

"Randall S. Becker" writes: > diff --git a/Documentation/Makefile b/Documentation/Makefile > index 3e39e28..4f1e6df 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -39,6 +39,8 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) > MAN_XML =

Re: [PATCH v3 1/7] git-compat-util: introduce skip_to_optional_arg()

Jeff King writes: > > + else if (starts_with(arg, "-B") || > +skip_to_optional_arg(arg, "--break-rewrites", NULL)) { > if ((options->break_opt = diff_scoreopt_parse(arg)) == -1) > > So that's kind-of weird, because we are parsing "-B", etc, and

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

Stefan Beller writes: > the information to what is shown. For example: > > $ ./git log --oneline --blobfind=v2.0.0:Makefile > b2feb64309 Revert the whole "ask curl-config" topic for now > 47fbfded53 i18n: only extract comments marked with "TRANSLATORS:" This part is a

[PATCH] clone: support 'clone --shared' from a worktree

When worktree functionality was originally implemented, the possibility of 'clone --local' from within a worktree was overlooked, with the result that the location of the "objects" directory of the source repository was computed incorrectly, thus the objects could not be copied or hard-linked by

Read

I am Ms.Ella Golan, I am the Executive Vice President Banking Division with FIRST INTERNATIONAL BANK OF ISRAEL LTD (FIBI). I am getting in touch with you regarding an extremely important and urgent matter. If you would oblige me the opportunity, I shall provide you with details upon your Response

Re: [PATCH v1 1/1] check-non-portable-shell.pl: Quoted `wc -l` is not portable

tbo...@web.de writes: > From: Torsten Bögershausen > > wc -l is used to count the number if lines in test scripts. H, "is used" -> "should not be used", probably. Just say "Use test_line_count instead" and leave the explanation why it is a better thing to use to fb3340a6

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

Hi, Yaroslav Halchenko wrote: > Example to show that TFM outlines precedence and --global correctly: > > $> grep xdg .gitconfig .config/git/config > .gitconfig:xdg-and-user = user > .config/git/config: xdg = xdg > .config/git/config: xdg-and-user = xdg > $> git config user.xdg ; git config

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/11, SZEDER Gábor wrote: > > Make sure that split index doesn't get broken, by running it on travis > > CI. > > > > Run the test suite with split index enabled in linux 64 bit mode, and > > leave split index turned off in 32-bit mode. > > This doesn't accurately describe what the patch

Re: [PATCH 2/3] prune: fix pruning with multiple worktrees and split index

On 12/11, Brandon Williams wrote: > On 12/10, Thomas Gummerer wrote: > > be489d02d2 ("revision.c: --indexed-objects add objects from all > > worktrees", 2017-08-23) made sure that pruning takes objects from all > > worktrees into account. > > > > It did that by reading the index of every worktree

Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

Dear Git Gurus, We [1] have got confused a bit about this recent addition of handling $XDG_CONFIG_HOME/git/config -- is it --global or not? ;) According to the man git-config (v 2.15.0 in debian) --global For writing options: write to global ~/.gitconfig file rather than

Re: [PATCH] send-email: extract email-parsing code into a subroutine

"PAYRE NATHAN p1508475" wrote: > --- a/git-send-email.perl > +++ b/git-send-email.perl > @@ -685,7 +685,7 @@ Lines beginning in "GIT:" will be removed. > Consider including an overall diffstat or table of contents > for the patch you are writing. > > -Clear

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

> Make sure that split index doesn't get broken, by running it on travis > CI. > > Run the test suite with split index enabled in linux 64 bit mode, and > leave split index turned off in 32-bit mode. This doesn't accurately describe what the patch does. Travis CI runs three 64 bit Linux build

Re: [PATCH v1] convert: add support for 'encoding' attribute

Am 11.12.2017 um 16:50 schrieb lars.schnei...@autodesk.com: From: Lars Schneider Git and its tools (e.g. git diff) expect all text files in UTF-8 encoding. Git will happily accept content in all other encodings, too, but it might not be able to process the text (e.g.

Re: [PATCH Outreachy 1/2] format: create pretty.h file

Оля Тележная writes: > Is it true that I need to fix only one commit message? (a typo > s/futher/further/) > > Do you have any other advises what do I need to change? I thought I mentioned that adding #include to all the current users of "commit.h" is way too noisy.

Re: [PATCH v2 4/4] t/Makefile: introduce TEST_SHELL_PATH

Jeff King writes: > I'm not sure that's true. Look at what already goes into > GIT-BUILD-OPTIONS: TEST_OUTPUT_DIRECTORY, GIT_TEST_CMP, GIT_PERF_*, etc. > > Interestingly, many of those do something like this in the Makefile: > > ifdef GIT_TEST_CMP > @echo GIT_TEST_OPTS=...

Re: submodule modify/delete wrong message

On Mon, 2017-12-11 at 12:27 -0800, Stefan Beller wrote: > On Mon, Dec 4, 2017 at 1:39 PM, David Turner > wrote: > > When merging with a submodule modify/delete conflict (i.e. I've > > deleted > > the submodule, and I'm merging in a branch that modified it), git > > lies > >

Re: [PATCH 1/3] repository: fix repo_read_index with submodules

On 12/11, Brandon Williams wrote: > On 12/10, Thomas Gummerer wrote: > > repo_read_index calls read_index_from, which takes an path argument for > > the location of the index file. For the split index however it relies > > on the current working directory to construct the path using git_path. > >

Re: submodule modify/delete wrong message

On Mon, Dec 4, 2017 at 1:39 PM, David Turner wrote: > When merging with a submodule modify/delete conflict (i.e. I've deleted > the submodule, and I'm merging in a branch that modified it), git lies > about what it is doing: > > "CONFLICT (modify/delete): submodule deleted in

[PATCH 0/1] diff-core blobfind

* added check for unmerged entries (!DIFF_PAIR_UNMERGED) * added support to find submodules * renamed the UI to `--find-object` instead of --blobfind. diff to currently queued below. Thanks, Stefan Stefan Beller (1): diffcore: add a filter to find a specific blob

[PATCH 1/1] diffcore: add a filter to find a specific blob

Sometimes users are given a hash of an object and they want to identify it further (ex.: Use verify-pack to find the largest blobs, but what are these? or [1]) One might be tempted to extend git-describe to also work with blobs, such that `git describe ` gives a description as ':'. This was

Re: Shared clone from worktree directory

On Mon, Dec 11, 2017 at 12:02 PM, Marc-André Lureau wrote: > For better, or worse, I encountered a script doing a git clone > --shared from the working directory. However, if clone --shared is run > from a worktree, it fails with cryptic errors. > >

Re: [PATCH] git-send-email: fix get_maintainer.pl regression

On Mon, Dec 11, 2017 at 6:26 PM, Thomas Adam wrote: > On Mon, Dec 11, 2017 at 05:13:53PM +, Alex Bennée wrote: >> So have we come to a consensus about the best solution here? >> >> I'm perfectly happy to send a reversion patch because to be honest >> hacking on a bunch of

Re: [PATCH v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

On Fri, 8 Dec 2017 14:30:10 -0800 Brandon Williams wrote: > I just finished reading through parts 1-3. Overall I like the series. > There are a few point's that I'm not a big fan of but i wasn't able to > come up with a better alternative. One of these being the need for a >

Re: [PATCH 2/3] prune: fix pruning with multiple worktrees and split index

On 12/10, Thomas Gummerer wrote: > be489d02d2 ("revision.c: --indexed-objects add objects from all > worktrees", 2017-08-23) made sure that pruning takes objects from all > worktrees into account. > > It did that by reading the index of every worktree and adding the > necessary index objects to

Re: [PATCH 1/3] repository: fix repo_read_index with submodules

On 12/10, Thomas Gummerer wrote: > repo_read_index calls read_index_from, which takes an path argument for > the location of the index file. For the split index however it relies > on the current working directory to construct the path using git_path. > > repo_read_index calls read_index_from

Re: [PATCH v5 7/9] sequencer: load commit related config

On 11/12/17 14:13, Phillip Wood wrote: > From: Phillip Wood > > Load default values for message cleanup, gpg signing of commits and > basic diff configuration in preparation for committing without forking > 'git commit'. Note that we interpret commit.cleanup=scissors

Re: [PATCH v1] convert: add support for 'encoding' attribute

On Mon, Dec 11, 2017 at 10:50 AM, wrote: > From: Lars Schneider > > Git and its tools (e.g. git diff) expect all text files in UTF-8 > encoding. Git will happily accept content in all other encodings, too, > but it might not be able to

Re: "git describe" documentation and behavior mismatch

Forget the above patch. I should compile my code after refactoring ... Here is the fixed version. -- >8 -- >From 8203bd0ad5baab7024ebff597c9f35a0250d09ff Mon Sep 17 00:00:00 2001 From: Daniel Knittl-Frank Date: Mon, 11 Dec 2017 19:24:54 +0100 Subject: [PATCH]

Re: "git describe" documentation and behavior mismatch

On Sun, Dec 3, 2017 at 6:39 AM, Junio C Hamano wrote: > I suspect that "see if the name recorded in the tag object matches > the name of the ref that stores the tag after refs/tags/" code *is* > not just verifying what it claims to (which may be good) but also > unintentionally

Re: [PATCH] decorate: clean up and document API

On Fri, 8 Dec 2017 04:55:11 -0500 Jeff King wrote: > I have mixed feelings. On the one hand, compiling and running the code > ensures that those things actually work. On the other hand, I expect you > can make a much clearer example if instead of having running code, you > show

Re: [PATCH] git-send-email: fix get_maintainer.pl regression

On Mon, Dec 11, 2017 at 05:13:53PM +, Alex Bennée wrote: > So have we come to a consensus about the best solution here? > > I'm perfectly happy to send a reversion patch because to be honest > hacking on a bunch of perl to handle special mail cases is not my idea > of fun spare time hacking

RE: Shared clone from worktree directory

On December 11, 2017 12:02 PM, Marc-André Lureau wrote: >For better, or worse, I encountered a script doing a git clone --shared from >the working directory. However, if clone --shared is run from a worktree, it >fails with cryptic errors. >elmarco@boraha:/tmp/test/wt (wt)$ git worktree list

Re: [PATCH] git-send-email: fix get_maintainer.pl regression

Junio C Hamano writes: > Thomas Adam writes: > >> Trying to come up with a reinvention of regexps for email addresses is asking >> for trouble, not to mention a crappy rod for your own back. Don't do that. >> This is why people use Mail::Address. >> >>

Shared clone from worktree directory

Hi, For better, or worse, I encountered a script doing a git clone --shared from the working directory. However, if clone --shared is run from a worktree, it fails with cryptic errors. Ex: elmarco@boraha:/tmp/test/wt (wt)$ git worktree list /tmp/test 4ae16a0 [master] /tmp/test/wt 4ae16a0

Hallo

United Nations Compensation Unit, in Verbindung mit der Weltbank Unsere Ref: U.N.O / W.BO / 11.11.2017 / 1982/09/05. Glückwunsch, Begünstigter, Wir haben eng mit der INTERPOL, CIA, FBI und anderen ausländischen internationalen Organisationen sowie Western Union und Money Gram bezüglich aller

[PATCH v1] convert: add support for 'encoding' attribute

From: Lars Schneider Git and its tools (e.g. git diff) expect all text files in UTF-8 encoding. Git will happily accept content in all other encodings, too, but it might not be able to process the text (e.g. viewing diffs or changing line endings). Add an attribute to

Re: [PATCH] builtin/tag.c: return appropriate value when --points-at finds an empty list

I agree with what you're saying, just I thought this might be ultra-minor for API-breakage. To me, 0 doesn't necessarily mean "I didn't segfault". I lot of tools use ret-values to give information back. And that way it's much easier to just `||` the command to something else instead of `[[ -z ]]`

[PATCH v5 7/9] sequencer: load commit related config

From: Phillip Wood Load default values for message cleanup, gpg signing of commits and basic diff configuration in preparation for committing without forking 'git commit'. Note that we interpret commit.cleanup=scissors to mean COMMIT_MSG_CLEANUP_SPACE to be consistent

[PATCH v5 8/9] sequencer: try to commit without forking 'git commit'

From: Phillip Wood If the commit message does not need to be edited then create the commit without forking 'git commit'. Taking the best time of ten runs with a warm cache this reduces the time taken to cherry-pick 10 commits by 27% (from 282ms to 204ms), and the time

[PATCH v5 9/9] t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1

From: Phillip Wood Now that the sequencer creates commits without forking 'git commit' it does not see an empty commit in these tests which fixes the known breakage. Note that logic for handling KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 is not removed from

[PATCH v5 6/9] sequencer: simplify adding Signed-off-by: trailer

From: Phillip Wood Add the Signed-off-by: trailer in one place rather than adding it to the message when doing a recursive merge and specifying '--signoff' when running 'git commit'. This means that if there are conflicts when merging with a strategy other than

[PATCH v5 5/9] commit: move print_commit_summary() to libgit

From: Phillip Wood Move print_commit_summary() from builtin/commit.c to sequencer.c so it can be shared with other commands. The function is modified by changing the last argument to a flag so callers can specify whether they want to show the author date in addition

[PATCH v5 4/9] commit: move post-rewrite code to libgit

From: Phillip Wood Move run_rewrite_hook() from bulitin/commit.c to sequencer.c so it can be shared with other commands and add a new function commit_post_rewrite() based on the code in builtin/commit.c that encapsulates rewriting notes and running the post-rewrite

[PATCH v5 2/9] commit: move empty message checks to libgit

From: Phillip Wood Move the functions that check for empty messages from bulitin/commit.c to sequencer.c so they can be shared with other commands. The functions are refactored to take an explicit cleanup mode and template filename passed by the caller.

[PATCH v5 3/9] Add a function to update HEAD after creating a commit

From: Phillip Wood Add update_head_with_reflog() based on the code that updates HEAD after committing in builtin/commit.c that can be called by 'git commit' and other commands. Signed-off-by: Phillip Wood --- Notes: changes since v2:

[PATCH v5 1/9] t3404: check intermediate squash messages

From: Phillip Wood When there is more than one squash/fixup command in a row check the intermediate messages are correct. Signed-off-by: Phillip Wood --- t/t3404-rebase-interactive.sh | 4 1 file changed, 4 insertions(+) diff --git

[PATCH v5 0/9] sequencer: don't fork git commit

From: Phillip Wood I've reworked the config handling since v4. It now stores the default values in struct replay_opt rather than using global variables and calls git_diff_basic_config(). Unfortunately I've not had time to modify git_gpg_config() to indicate if it

Re: [PATCH] builtin/tag.c: return appropriate value when --points-at finds an empty list

On 12/11/2017 8:44 AM, George Papanikolaou wrote: `git tag --points-at` can simply return if the given rev does not have any tags pointing to it. It's not a failure but it shouldn't return with 0 value. I disagree. I think the 0 return means "I completed successfully" and the empty output

[PATCH] builtin/tag.c: return appropriate value when --points-at finds an empty list

`git tag --points-at` can simply return if the given rev does not have any tags pointing to it. It's not a failure but it shouldn't return with 0 value. --- builtin/tag.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/tag.c b/builtin/tag.c index b38329b59..68b84db2a 100644 ---

Re: How to begin an error/die string? Upper- or lower-case letter?

On Mon, Dec 11, 2017 at 10:23 AM, Lars Schneider wrote: > Hi, > > error() and die() messages seems to begin with upper-case and > lower-case letters in the Git code base: > > git grep 'error(_' | perl -nE 'say /.*error\(_\("(.).*/' | sort | uniq -c > git grep 'die(_'

How to begin an error/die string? Upper- or lower-case letter?

Hi, error() and die() messages seems to begin with upper-case and lower-case letters in the Git code base: git grep 'error(_' | perl -nE 'say /.*error\(_\("(.).*/' | sort | uniq -c git grep 'die(_' | perl -nE 'say /.*die\(_\("(.).*/' | sort | uniq -c Do we prefer one way over the other?

Re: [PATCH Outreachy 1/2] format: create pretty.h file

Is it true that I need to fix only one commit message? (a typo s/futher/further/) Do you have any other advises what do I need to change? Thanks!

Antw: Re: Re: bug deleting "unmerged" branch (2.12.3)

Hi! Sorry for the late response: On a somewhat not-up-to date manual: -d, --delete Delete a branch. The branch must be fully merged in its upstream branch, or in HEAD if no upstream was set with --track or --set-upstream. Maybe the topic of multiple