Please confirm receipt of my previous mail..When can i call you
--
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://vger.kernel.org/majordomo-info.html
comprehensive brief
once I hear from you. Thanks and reply. Robert Grondahl
--
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://vger.kernel.org/majordomo-info.html
git log output in the chapter.
$ git log --oneline --decorate --graph --all
* c2b9e (HEAD, master) made other changes
| * 87ab2 (testing) made a change
I suggest to fix the picture or clarify the reason in the chapter.
Hope it helps,
Robert
--
To unsubscribe from this list: send the line "
list.
The last sentence is made with BOLD font and I assumed that this
applies to the book as well as it is hosted on this domain (so what
other bugs are they talking about BTW?)
I'll have a look to github*/issues as you've suggested.
Thanks,
Robert
On Wed, Sep 9, 2015 at 3:08 PM
working directory clean
I’m aware that I should have aborted the rebase and then fetch the remote
branch.
However, I still think that when I delete a local branch, it should also abort
the rebase that is attached to it.
I hope you find that useful. If it makes sense, I would be happy writing
For convenient pushing of current branch, git supports this syntax:
$ git push origin HEAD
This will push your current branch up. However, is there such a
shortcut for *deleting* the branch? The only goal here is to avoid
having to type the branch name in the push command. Normally I rely on
tab
On Thu, Oct 1, 2015 at 1:22 PM, Jacob Keller wrote:
> On Thu, Oct 1, 2015 at 9:43 AM, Robert Dailey
> wrote:
>> For convenient pushing of current branch, git supports this syntax:
>>
>> $ git push origin HEAD
>>
>> This will push your current branch up. Howe
On 5/21/2015 7:51 AM, Heiko Voigt wrote:
On Tue, May 19, 2015 at 02:29:55PM -0500, Robert Dailey wrote:
On Tue, May 19, 2015 at 5:44 AM, Heiko Voigt wrote:
On Mon, May 18, 2015 at 10:06:32AM -0500, Robert Dailey wrote:
Unfortunately I find it unintuitive and counter productive to perform
On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> In the meantime I'd like to ask, do we even need to add an option for
>> this? What if we just make `diff.submodule log` not use
>> --first-parent? This seems like a backward comp
On Sat, May 30, 2015 at 2:19 PM, Robert Dailey wrote:
> On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote:
>> Robert Dailey writes:
>>
>>> In the meantime I'd like to ask, do we even need to add an option for
>>> this? What if we just make `diff.sub
On Sat, May 30, 2015 at 2:54 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote:
>>> Robert Dailey writes:
>>>
>>>> In the meantime I'd like to ask, do we even need to add an option for
I do the following:
$ git push origin :topic
If I stop halfway through typing 'topic' and hit TAB, auto-completion
does not work if I do not have a local branch by that name (sometimes
I delete my local branch first, then I push to delete it remotely). I
thought that git completion code was suppo
On Thu, Jun 18, 2015 at 6:29 AM, SZEDER Gábor wrote:
> Quoting Robert Dailey
>> I do the following:
>>
>> $ git push origin :topic
>>
>> If I stop halfway through typing 'topic' and hit TAB, auto-completion
>> does not work if I do not have a lo
On Thu, Jun 18, 2015 at 10:55 AM, SZEDER Gábor wrote:
>
> Quoting Robert Dailey :
>
>> On Thu, Jun 18, 2015 at 6:29 AM, SZEDER Gábor wrote:
>>>
>>> Quoting Robert Dailey
>>>>
>>>> I do the following:
>>>>
>>>> $
Upon inspection of the gitattributes documentation page here:
https://git-scm.com/docs/gitattributes
When comparing the documentation for 'text' with 'eol', I see the
following missing explanations for 'eol':
* eol
* -eol
Maybe the fact that these are missing means they are not valid to use.
The
On Sun, Jun 21, 2015 at 9:04 AM, Robert Dailey wrote:
> Upon inspection of the gitattributes documentation page here:
> https://git-scm.com/docs/gitattributes
>
> When comparing the documentation for 'text' with 'eol', I see the
> following missing explana
I have a few nested submodules, all use relative URLs such as:
../mysubmodule.git
../../tools/tool1.git
If I change my parent repo URL, I need to recursively update all
remotes in each submodule. There is no `--recursive` option for `git
submodule init`. What is the recommend method for accomplis
On Thu, Jun 25, 2015 at 8:04 PM, Robert Dailey wrote:
> I have a few nested submodules, all use relative URLs such as:
>
> ../mysubmodule.git
> ../../tools/tool1.git
>
> If I change my parent repo URL, I need to recursively update all
> remotes in each submodule. There is no
>From 0428b0a1248fb84c584a5a6c1f110770c6615d5e Mon Sep 17 00:00:00 2001
From: Robert Collins
Date: Tue, 7 Jul 2015 15:43:24 +1200
Subject: [PATCH] git am: Transform and skip patches via new hook
A thing I need to do quite a lot of is extracting stuff from
Python to backported libraries. T
le propriétaire du fond nos
principaux bailleurs ( chef financer ) .
Il est très impératif que nous répondons à notre adresse privé au
( robertgepo...@gmail.com), qui nous permet de recevoir et répondre
vous dès que possible.
Cordialement,
Mr ROBERT GEPOR.
Email:robertgepo...@gmail.com
Pa
Here's the scenario:
I create a topic branch so one other developer and myself can work on
a feature that takes 2 weeks to complete. During that 2 week period,
changes are occurring on master that I need in my topic branch. Since
I have a collaborator on the branch, I opt for merges instead of
reb
On Fri, Jan 6, 2017 at 3:28 PM, Philip Oakley wrote:
> From: "Robert Dailey"
>>
>> Here's the scenario:
>>
>> I create a topic branch so one other developer and myself can work on
>> a feature that takes 2 weeks to complete. During that 2 week p
Hello my name is Ms. Thandi Robert, from Ivory Coast. My parents were brutally
mulled by the former president Laurent Gbagbo because of political crisis as
the only survival of my family. I got your email while searching for a reliable
personality in my private study on the internet. I am in
Hello my name is Ms. Thandi Robert, from Ivory Coast. My parents were brutally
mulled by the former president Laurent Gbagbo because of political crisis as
the only survival of my family. I got your email while searching for a reliable
personality in my private study on the internet. I am in
Hello my name is Ms. Thandi Robert, from Ivory Coast. My parents were brutally
mulled by the former president Laurent Gbagbo because of political crisis as
the only survival of my family. I got your email while searching for a reliable
personality in my private study on the internet. I am in
Normally when I use interactive add, I just want to add files to the
index via simple numbers, instead of typing paths. So I'll do this as
quick as I can:
1. Type `git add -i`
2. Press `u` after prompt appears
3. Press numbers for the files I want to add, ENTER key
4. ENTER key again to go back to
I have 3 remotes registered in my clone:
origin, fork, drive
When I do:
$ git log --oneline --decorate --graph
I only want to see branches under:
refs/heads/*
refs/remotes/origin/*
I tried the following:
$ git log --oneline --decorate --graph --simplify-by-decoration
--remote=origin topic1..
Hello git experts,
I have in the past attempted to integrate submodules into my primary
repository using the same directory name. However, this has always
caused headache when going to and from branches that take you between
when this integration occurred and when it didn't. It's a bit hard to
exp
On Tue, Oct 18, 2016 at 4:17 PM, Stefan Beller wrote:
> On Tue, Oct 18, 2016 at 12:35 PM, Robert Dailey
> wrote:
>> Hello git experts,
>>
>> I have in the past attempted to integrate submodules into my primary
>> repository using the same directory name. Howe
On Wed, Oct 19, 2016 at 11:23 AM, Stefan Beller wrote:
> You could try this patch series:
> https://github.com/jlehmann/git-submod-enhancements/tree/git-checkout-recurse-submodules
> (rebased to a newer version; no functional changes:)
> https://github.com/stefanbeller/git/tree/submodule-co
> (I'l
On Wed, Oct 19, 2016 at 2:45 PM, Stefan Beller wrote:
> On Wed, Oct 19, 2016 at 12:19 PM, Robert Dailey
> wrote:
>> On Wed, Oct 19, 2016 at 11:23 AM, Stefan Beller wrote:
>>> You could try this patch series:
>>> https://github.com/jlehmann/git-submod-enhancem
On Wed, Oct 19, 2016 at 2:51 PM, Robert Dailey wrote:
> On Wed, Oct 19, 2016 at 2:45 PM, Stefan Beller wrote:
>> On Wed, Oct 19, 2016 at 12:19 PM, Robert Dailey
>> wrote:
>>> On Wed, Oct 19, 2016 at 11:23 AM, Stefan Beller wrote:
>>>> You could try this p
g
the internet via a proxy)
A reinstallation of the software did't helped neither.
For your help I would like to thank you already in advance.
Kind Regards
Robert Fellendorf
The release notes mention a new heuristic for diff:
* Output from "git diff" can be made easier to read by selecting
which lines are common and which lines are added/deleted
intelligently when the lines before and after the changed section
are the same. A command line option is added to help with
If you consider a simple case where I run the following command:
$ git log --oneline --graph --decorate A...B
Where A and B are both branches with a single merge base and a series
of commits on each branch. Very simple example with no loops or crazy
ancestry. Below is an example repo I set up, wh
On Sat, May 14, 2016 at 6:30 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> This is because the merge base commit isn't shown. I understand this
>> is "by-design", but is there a way to include it? It's necessary to
>> have it, for this graph
Sometimes, I merge 2 branches that have deviated quite a bit. A
worst-case example would be some API change. The topic branch
(long-lived) may start using the old API. However, once I merge the
topic back to master, that API no longer exists. As such, every place
that introduces a usage of the old
I think it would be useful to have a '-w' option for 'git add' that
completely ignores whitespace changes, the same way that 'git diff -w'
does.
Real life scenario:
Sometimes developers will use tooling that does not properly strip
trailing whitespace in source files. Next time I edit those files
On Mon, May 30, 2016 at 2:06 PM, Junio C Hamano wrote:
> I have had this in my ~/.gitconfig for a long time.
>
> [alias]
> wsadd = "!sh -c 'git diff -- \"$@\" | git apply --cached
> --whitespace=fix;\
> git co -- ${1-.} \"$@\"' -"
>
> That is, "take what's different from t
On Mon, May 30, 2016 at 5:00 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> I like your solution better than mine because it utilizes the rules
>> defined in .gitattributes.
>
> A difference that may be more important is that I do not do
> generation of a
My use case is that I do a merge from branch A to branch B. Branch A
modified a file which is already deleted on B some time before the
merge.
When I do a `git status -sb`, these locally deleted but remotely
modified files show up as "DU".
I want to invoke git status or diff (or something else) t
On Wed, Aug 17, 2016 at 1:34 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> My use case is that I do a merge from branch A to branch B. Branch A
>> modified a file which is already deleted on B some time before the
>> merge.
>>
>> When I do a `git st
I want to view the complete diff of my branch (topic) relative to its
parent branch (master). This should include cached/staged files and
unstaged working tree changes.
If I do this:
$ git diff master
This will include changes on master *since* my last merge, which I do
not want (I don't want to
On Wed, Aug 24, 2016 at 11:00 AM, Michael J Gruber
wrote:
> The 3-dot notation means:
>
> Show the difference between the merge-base of master and topic, and topic.
>
> I'm not completely sure, but I guess what you want is:
>
> Show the difference between the merge-base of master and topic, and th
Suppose I have a branch with 4 commits, in the following order (as you
might see during interactive rebase):
pick 123 Original Change
pick 789 fixup! Original Change
pick 456 Some Other Thing
pick abc fixup! fixup! Original Change
However, let's say the first commit is already pushed upstream on
On Fri, Sep 2, 2016 at 9:22 PM, Junio C Hamano wrote:
> Perhaps a change like this to "rebase -i":
>
> - The search for "original" when handling "pick fixup! original",
>when it does not find "original", could turn it into "reword
>fixup! original" without changing its position in the ins
I noticed that `git clean` does not handle a specific scenario. I have
the following types of untracked entities in my working copy:
* Untracked files in tracked directories (non-recursive; sibling files
are tracked)
* Untracked files in untracked directories (recursive)
* Ignored files meeting th
As you know, I can checkout the Nth checked out branch via this syntax:
$ git checkout @{-N}
Is there a built-in mechanism to get a listing of previously checked
out refs? Basically, this would be similar to 'history' command in
linux where instead of actual commands, it lists like this:
HEAD@{-
I have an alias that I'm working on to do a push and delete of a topic branch:
# Push HEAD, delete branch local & remote
#
# $1 = remote name
# $2 = branch name
pushdel = "!f() { : git push ; git push \"$1\" HEAD \":$2\" && git
branch -d \"$2\" ; }; f"
I use it after I merge
On Fri, Mar 25, 2016 at 12:45 PM, Junio C Hamano wrote:
> You can ask rev-parse to give you --symbolic-full-name, error out if
> it is empty (i.e. detached HEAD), and otherwise use the result, no?
>
> $ git checkout next
> $ git checkout master
> $ git rev-parse --symbolic-full-name @{
On Fri, Mar 25, 2016 at 1:02 PM, Robert Dailey wrote:
> On Fri, Mar 25, 2016 at 12:45 PM, Junio C Hamano wrote:
>> You can ask rev-parse to give you --symbolic-full-name, error out if
>> it is empty (i.e. detached HEAD), and otherwise use the result, no?
>>
>&
On Fri, Mar 25, 2016 at 1:58 PM, Junio C Hamano wrote:
> I thought these are clear from their documentation. "push" works on
> refnames, "branch" works on branch names. "push" takes an branch
> name as a short-hand and adds refs/heads/ when it makes sense, but
> because it does not make any sens
This is a bug report for the Mac OS X packaging at
http://git-scm.com/download/mac . It is not so much a
software bug as a nonoptimal configuration setting.
Requested Change
Remove the line "excludesfile = ~/.gitignore" under [core] from
/usr/local/git/etc/gitconfig
Reasons:
#1
The documentation
at all is fine - perhaps to do with
the index? Or does this seem to be more likely an issue we created
ourselves? Would there have been any other commands we could have run
to resolve this issue or should have tried out first? (Apart from just
deleting each of our clones and starting again)
Robert
On Wed, Mar 27, 2019 at 5:27 AM Ævar Arnfjörð Bjarmason
wrote:
>
>
> On Wed, Mar 27 2019, Elijah Newren wrote:
>
> > On Tue, Mar 26, 2019 at 12:56 AM Denton Liu wrote:
> >>
> >> Robert Dailey reported confusion on the mailing list about a recursive
>
Similar to git commit, it would be nice to have a --no-edit option for
git tag. Use case is when I force-recreate a tag:
$ git tag -af 1.0 123abc
An editor will be prompted with the previous annotated tag message. I
would like to add --no-edit to instruct it to use any previously
provided message
On Wed, Apr 3, 2019 at 3:50 AM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > I am not sure if this is so bad, actually. Why do we need to treat
> > it as a mistake? When a command that wants a commit is fed a tag
> > (either a tag that directly refers to a commit, or a tag that tags
>
On Thu, Apr 4, 2019 at 4:32 AM Junio C Hamano wrote:
>
> Robert Dailey writes:
>
> >> > more clear in the doc and/or in the proposed log message what
> >> > practical downside there are to the end users if we do not stop this
> >> > "mistake&quo
{ OPTION_INTEGER, 'n', NULL, &filter.lines, N_("n"),
>
> which even does the right thing with "git tag --no-edit -a foo" (it dies
> with "fatal: no tag message?"
>
> > This makes me think that we should do two things:
> >
On Thu, Apr 4, 2019 at 8:56 AM Robert Dailey wrote:
>
> On Thu, Apr 4, 2019 at 7:06 AM Jeff King wrote:
> >
> > On Wed, Apr 03, 2019 at 08:26:06PM -0700, Taylor Blau wrote:
> >
> > > Agreed.
> > >
> > > I think that the implement is a little
On Thu, Apr 4, 2019 at 4:50 PM Junio C Hamano wrote:
>
> Robert Dailey writes:
>
> > It might be fine within the realm of git itself, because git knows how
> > to deal with them by peeling, as you say, but there are 3 reasons I
> > dislike that this is allowed:
>
feature be accepted?
--
Damien Robert
not sure I understand what a no-op `git fetch` means exactly.
In the "git fetch; ; git pull" scenario,
after I do the real `git fetch` and want to merge/rebase the changes, how
would I prevent `git pull` to pull new commits that were pushed in between?
--
Damien Robert
>From Damien Robert, Mon 08 Apr 2019 at 16:53:40 (+0200) :
> > Others may have a better idea, but I do not immediately see any
> > solution better than inventing a new option to "git pull".
So here is a RFC patch that implements --no-fetch. (I am not sure about
the wor
When I perform a rebase and it stops at a commit due to a conflict,
the messages printed are very verbose. Example:
```
Applying: Delete run configuration for zPayServiceStandalone
Using index info to reconstruct a base tree...
A .idea/runConfigurations/zPayServiceStandalone.xml
Falling back
epends on the state of the git repositories of previous tests rather
than creating the git repos from scratch (presumably for the sake of
speed), so I was afraid to break things. But I see that I can probably
reuse the repos from the test 'setupt for detecting upstreamed changes'.
So I'll try (when I have time...) to do a RFC implementation of a 'noop
fetch' approach. I first need to understand the source of fetch.c better,
in particular how to do something like store_updated_refs when we are doing
a noop fetch (so without using transports).
--
Damien Robert
http://www.normalesup.org/~robert/pro
ch in two, one
introducing `stat_push_info` in remote.c and the following one using it in
ref-filter.c
Damien Robert (1):
Fix %(push:track) in ref-filter
ref-filter.c| 7 ++--
remote.c| 78 +++--
remote.h| 2 ++
t/
so that the upstream branch is ahead by 2 while the push
branch is ahead by 1, this allow us to test that %(push:track) refer to
the correct branch.
This change the expected value of some following tests, so update them
too.
Signed-off-by: Damien Robert
---
ref-filter.c| 7
pple effects of the test changes, since I think we'll end up
> changing them again to make sure ":trackshort" is distinct.
There are now less impactful than before because the master branch in the
test refers to the same commit as before; there is just a new commit for the
'myf
ntainer could adjust them when he picks up the patch). But
> there are just enough that it's probably worth making his life easier
> with a v3.
> You can put my Reviewed-by on it, too. :)
Here it is:
>8
From: Damien Robert
Date: Tue, 16 Apr 2019 14:16:46 +0200
Subject: [PA
I'm hoping this is mostly a learning opportunity for me. I'm assuming
things are working as designed, but I just don't understand something
fundamental.
I have a merge commit. HEAD is currently pointing at this merge
commit. To be exact, HEAD points to master, which points to the merge
commit. My
I feel like you got hung up too much on exact wording of what I was
trying to describe. I do apologize I don't have the background to
explain things 100% accurately, especially at a low level. My
explanations are mostly intended to be as a user, based on what is
observable, and based on intent. I'l
On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason wrote:
> Maybe an example helps, let's say you have two paint buckets, one with
> red paint, one with yellow paint. You mix them. What happens?
>
> (
> rm -rf /tmp/git &&
> git init /tmp/git &&
> cd /tmp/git &&
>
On Tue, May 7, 2019 at 9:10 AM Robert Dailey wrote:
> Your example is very helpful. I understand what you're saying for
> conflicted lines. But the "whatever the default merge resolution would
> have been" doesn't exist, because there's no reality where line
Everything I'm going to describe is related to this repository:
https://github.com/powervr-graphics/Native_SDK
This repo has several distinct branches. None of them seem to be tied
to each other. Instead of having a `master` where they branched off
each of their releases (e.g. 3.1, 3.2, 4.0), it
On Fri, May 24, 2019 at 9:04 AM Robert Dailey wrote:
>
> Everything I'm going to describe is related to this repository:
>
> https://github.com/powervr-graphics/Native_SDK
>
> This repo has several distinct branches. None of them seem to be tied
> to each other. Instead
On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote:
>
> On Mai 24 2019, Robert Dailey wrote:
>
> > Can anyone provide some advice on how to properly restructure this
> > repository to create some ancestry, as if all along a `master` existed
> > and all release branc
On Tue, May 28, 2019 at 8:35 AM Robert Dailey wrote:
>
> On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote:
> >
> > On Mai 24 2019, Robert Dailey wrote:
> >
> > > Can anyone provide some advice on how to properly restructure this
> > > repository
subscribe git
Apologies list! Thanks Kevin. That's what I get for troubleshooting
plain-text in Gmail and quickly sending a subscribe email before
walking out.
Robert
On Thu, Jul 11, 2019 at 3:18 PM Kevin Daudt wrote:
>
> On Thu, Jul 11, 2019 at 03:11:33PM -0500, Robert Morgan wrote:
> &
Thanks Junio.
I was looking at 'smimesign' and working to understand how, when set
within 'gpg.program', it conformed with gpg's usage within git
sign,verify etc. I happened to look at the docs for the 'gpg.program'
config variable and noticed the discrepancy.
the reason for these inconsistencies?
---
Robert White
I'd like to sort the output of `git diff --stat` such that files are
listed in descending order based on number of lines changed. The
closest solution I've found online[1] has several readability issues.
I'd rather see a built-in solution in git, if one exists. Can anyone
recommend a solution?
[1]
On Wed, Oct 17, 2018 at 1:47 PM Jeff King wrote:
> Hmm, I feel like another person asked for this recently, but I can't
> seem to find the thread.
Is it this one?
https://www.mail-archive.com/git@vger.kernel.org/msg159212.html
That's the only one I was able to find, but no one replied. Thanks fo
Am a United State Army here in Afghanistan, am seeking your help to evacuate
the sum of $ 7,000,000 to you as long as I am assured it will be safe That in
your care Until I complete my service here in Afghanistan. This is not stolen
money and there are no dangers involved. I count on your und
I have a particular tag in my repo that shows 2 annotated
descriptions, which is very confusing.
The command I ran:
```
git show --format=fuller 4.2.0.1900
```
And the output:
```
tag 4.2.0/1900
Tagger: John Doe
TaggerDate: Fri Jul 18 10:46:30 2014 -0500
QA/Internal Release for 4.2.0.19
On Thu, Mar 21, 2019 at 2:29 PM Jeff King wrote:
> Tags can point to any object, including another tag. It looks like
> somebody made an annotated tag of an annotated tag (probably by
> mistake, given that they have the same tag-name).
>
> Try this:
>
> git init
> git commit -m commit --allow-
On Mon, Mar 25, 2019 at 9:49 AM Jeff King wrote:
> I think "just commits" is too restrictive. linux.git contains a tag of a
> tree, for example (we also have tags pointing to blobs in git.git, but
> they are not annotated).
>
> However, I could see an argument for the git-tag porcelain to notice a
dès que nous
recevrons votre réponse.
S’il vous plaît contacter moi dès que possible avec le détail de votre projet.
Sincères salutations.
Mr Robert Gepor
Ich habe einen Wohltätigkeitsfonds für Sie im Wert von € 4,800,000. Diese
Spende ist
für die ersten 5 Personen, die auf diese E-Mail antworten, die als Form von
Wohltätigkeitshäusern zu Ehren meiner verstorbenen Frau gegeben wird, die an
Krebs
gestorben ist. Kontaktieren Sie meinen Anwalt über
Ich habe einen Wohltätigkeitsfonds für Sie im Wert von € 4,800,000. Diese
Spende ist
für die ersten 5 Personen, die auf diese E-Mail antworten, die als Form von
Wohltätigkeitshäusern zu Ehren meiner verstorbenen Frau gegeben wird, die an
Krebs
gestorben ist. Kontaktieren Sie meinen Anwalt über
Problem: I want to avoid recursively fetching submodules when I run a
`fetch` command, and instead defer that operation to the next
`submodule update`. Essentially I want `fetch.recurseSubmodules` to be
`false`, and `get submodule update` to do exactly what it does with
the `--remote` option, but s
On Thu, Aug 2, 2018 at 1:08 AM, Jonathan Nieder wrote:
> I think I misread this the first time. I got distracted by your
> mention of the --remote option, but you mentioned you want to use the
> SHA-1 of the submodule listed, so that was silly of me.
>
> I think you'll find that "git fetch --no-r
On Mon, Aug 6, 2018 at 10:41 AM, Jonathan Nieder wrote:
> Robert Dailey wrote:
>
>> Automatic would be
>> great if submodules were treated as integrated in a similar manner to
>> subtree, but it's not there. I wasn&#
Is there an 'auto' setting for the 'core.autocrlf' config? Reason I
ask is, I want that setting to be 'input' on linux but 'true' on
Windows. I have a global .gitconfig that I sync across different
platforms with Google Drive, and I hate to manage 2 copies of it on
each platform (linux and Windows)
On Mon, Aug 27, 2018 at 10:53 AM Duy Nguyen wrote:
>
> On Mon, Aug 27, 2018 at 5:37 PM Torsten Bögershausen wrote:
> > > In those cases, when it falls back to
> > > configuration for line ending management, I want it to be
> > > automatically configured based on the host platform.
> >
> > There i
On Mon, Aug 27, 2018 at 12:32 PM Andrei Rybak wrote:
>
> On 2018-08-27 17:52, Duy Nguyen wrote:
> > On Mon, Aug 27, 2018 at 5:37 PM Torsten Bögershausen wrote:
> >>> In those cases, when it falls back to
> >>> configuration for line ending management, I want it to be
> >>> automatically configure
On Wed, Aug 29, 2018 at 11:54 PM Jonathan Nieder wrote:
>
> Hi,
>
> Robert Dailey wrote:
>
> > Is there an 'auto' setting for the 'core.autocrlf' config? Reason I
> > ask is, I want that setting to be 'input' on linux but 'true
I've observed that when merging a branch, and there's a submodule
conflict, sometimes Git will prompt a suggested resolution like so:
```
Failed to merge submodule Core (not fast-forward)
Found a possible merge resolution for the submodule:
If this is correct simply add it to the index for exampl
1 - 100 of 591 matches
Mail list logo
