Hi Jonathan,
If it's really just a matter of needing someone with a newcomer's
perspective, then I'd be happy to look over the ordering of the git
subcommands. You can run the command I provided to glean the frequency
of each subcommand from your shell history, I'll look over the output
and see
On (06/07/18 12:24), Junio C Hamano wrote:
>
> Jeff King writes:
>
> > On Thu, Jul 05, 2018 at 09:50:53PM +0200, Beat Bolli wrote:
> >
> >> > Your patch is obviously correct, but I think here there might be an even
> >> > simpler solution: just bump option_parse_type() below the declaration,
>
On (07/07/18 11:40), SZEDER Gábor wrote:
>
> On Fri, Jul 6, 2018 at 6:39 PM Junio C Hamano wrote:
> >
> > Duy Nguyen writes:
> >
> > > On Sat, Jun 30, 2018 at 03:38:21PM +0200, Kim Gybels wrote:
> > >> Teach gc --auto to release pack files before auto packing the repository
> > >> to prevent
On (07/07/18 08:34), Elijah Newren wrote:
> Hi Dscho,
>
> On Sat, Jul 7, 2018 at 5:11 AM, Johannes Schindelin
> wrote:
> > Hi Elijah,
> >
> > On Fri, 6 Jul 2018, Elijah Newren wrote:
> >
> >> On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:
> >> > I'll be pushing out the integration
Hi Junio,
On Sat, 7 Jul 2018, Johannes Schindelin wrote:
> On Sat, 7 Jul 2018, Junio C Hamano wrote:
>
> > Johannes Schindelin writes:
> >
> > >> Does the "gitgitgadget" thing lie on the Date: e-mail header?
> > >
> > > No, GitGitGadget takes the literal output from `git format-patch`, as far
From: Linus Torvalds
This adds --date=human, which skips the timezone if it matches the
current time-zone, and doesn't print the whole date if that matches (ie
skip printing year for dates that are "this year", but also skip the
whole date itself if it's in the last few days and we can just
For a directory/submodule conflict, we want contents from both the
directory and the submodule to be present for the user to use to resolve
the conflict, but we do not want paths under the directory being written
into the submodule and we do not want the merge being confused by paths
under the
Last November, Stefan asked me about an issue with submodules. In
addition to providing a fix for that issue, I mentioned a few other
problems I noticed with submodules and merging[1]. Turn those issues
into testcases (as I probably should have done back then).
[1]
In the case of a file/submodule conflict, although both cannot exist at
the same path, we expect both to be present somewhere for the user to be
able to resolve the conflict with. Add a testcase for this.
Signed-off-by: Elijah Newren
---
t/t7405-submodule-merge.sh | 56
Signed-off-by: Elijah Newren
---
t/t7405-submodule-merge.sh | 26 ++
1 file changed, 26 insertions(+)
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 6cb51c966..9f71a4859 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
On Sat, Jul 7, 2018 at 12:58 PM Linus Torvalds
wrote:
>
> I'm playing with making all "today" dates just use the relative
> format.
Here's the incremental patch for that if people want to compare the output.
With this, you never get the "just time" case, because that will turn
into "2 hours
On Sat, Jul 7, 2018 at 12:39 PM Linus Torvalds
wrote:
> to me, but with "--date=human", right now it just says
>
> Date: 12:21
Side note: this is probably my least favorite of the formats.
I'm playing with making all "today" dates just use the relative
format, and then the "a couple of
From: Linus Torvalds
This adds --date=human, which skips the timezone if it matches the
current time-zone, and doesn't print the whole date if that matches (ie
skip printing year for dates that are "this year", but also skip the
whole date itself if it's in the last few days and we can just
Hi Junio,
On Sat, 7 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Does the "gitgitgadget" thing lie on the Date: e-mail header?
> >
> > No, GitGitGadget takes the literal output from `git format-patch`, as far
> > as I can tell. So if at all, it is `format-patch` that is
Junio C Hamano writes:
> I actually think that is a good example of doing the same thing
> slightly differently. ...
[jc: Beating the dead horse, only to avoid misleading those who are
learning from the sidelines...]
The above was a stupid thing to say and end the message with, as it
made it
Johannes Schindelin writes:
>> Does the "gitgitgadget" thing lie on the Date: e-mail header?
>
> No, GitGitGadget takes the literal output from `git format-patch`, as far
> as I can tell. So if at all, it is `format-patch` that is lying.
format-patch faithfully records the fact about the commit
Christian Couder writes:
>> + default:
>> + BUG("Unhandled rebase type %d", opts->type);
>> + break;
>
> Nit: I think the "break;" line could be removed as the BUG() should always
> exit.
>
> A quick grep shows that there are other places where there is a
>
Hi Dscho,
On Sat, Jul 7, 2018 at 5:11 AM, Johannes Schindelin
wrote:
> Hi Elijah,
>
> On Fri, 6 Jul 2018, Elijah Newren wrote:
>
>> On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:
>> > I'll be pushing out the integration branches with some updates, but
>> > there is no change in 'next'
Hi Elijah,
On Fri, 6 Jul 2018, Elijah Newren wrote:
> On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:
> > I'll be pushing out the integration branches with some updates, but
> > there is no change in 'next' and below. The following topics I gave
> > a quick look and gave them topic
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> I'll be pushing out the integration branches with some updates, but
> there is no change in 'next' and below. The following topics I gave
> a quick look and gave them topic branches, but I had trouble merging
> them in 'pu' and making them
Hi Christian,
On Sat, 7 Jul 2018, Christian Couder wrote:
> On Fri, Jul 6, 2018 at 2:08 PM, Pratik Karki wrote:
>
> > + switch (opts->type) {
> > + case REBASE_AM:
> > + backend = "git-rebase--am";
> > + backend_func = "git_rebase__am";
> > +
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > Tab completion of `git range-diff` is very convenient, especially
> > given that the revision arguments to specify the commit ranges to
> > compare
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The problem solved by the code introduced in this commit goes like this:
> > given two sets of items, and a cost matrix which says how much it
> >
On Wed, Jul 4, 2018 at 10:16 PM Kim Gybels wrote:
> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
> index e402aee6a2..ef599c11cd 100755
> --- a/t/t5510-fetch.sh
> +++ b/t/t5510-fetch.sh
> @@ -828,10 +828,12 @@ test_expect_success 'fetching with auto-gc does not
> lock up' '
>
On Fri, Jul 6, 2018 at 6:39 PM Junio C Hamano wrote:
>
> Duy Nguyen writes:
>
> > On Sat, Jun 30, 2018 at 03:38:21PM +0200, Kim Gybels wrote:
> >> Teach gc --auto to release pack files before auto packing the repository
> >> to prevent failures when removing them.
> >>
> >> Also teach the test
On Fri, Jul 6, 2018 at 2:08 PM, Pratik Karki wrote:
> + switch (opts->type) {
> + case REBASE_AM:
> + backend = "git-rebase--am";
> + backend_func = "git_rebase__am";
> + break;
> + case REBASE_INTERACTIVE:
> + backend =
26 matches
Mail list logo
